diff --git a/TEST_MAPPING b/TEST_MAPPING
index 72e022b..370acd6 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -21,6 +21,25 @@
       "name": "TCSModelDownloaderIntegrationTest"
     }
   ],
+  "hwasan-postsubmit": [
+    {
+      "name": "TextClassifierServiceTest",
+      "options": [
+        {
+          "exclude-annotation": "androidx.test.filters.FlakyTest"
+        }
+      ]
+    },
+    {
+      "name": "libtextclassifier_tests"
+    },
+    {
+      "name": "libtextclassifier_java_tests"
+    },
+    {
+      "name": "TextClassifierNotificationTests"
+    }
+  ],
   "mainline-presubmit": [
     {
       "name": "TextClassifierNotificationTests[com.google.android.extservices.apex]"
diff --git a/native/utils/tokenfree/byte_encoder_test.cc b/native/utils/tokenfree/byte_encoder_test.cc
index d4d119e..964e316 100644
--- a/native/utils/tokenfree/byte_encoder_test.cc
+++ b/native/utils/tokenfree/byte_encoder_test.cc
@@ -29,7 +29,7 @@
 
 using testing::ElementsAre;
 
-TEST(EncoderTest, SimpleTokenization) {
+TEST(ByteEncoderTest, SimpleTokenization) {
   const ByteEncoder encoder;
   {
     std::vector<int64_t> encoded_text;
@@ -39,7 +39,7 @@
   }
 }
 
-TEST(EncoderTest, SimpleTokenization2) {
+TEST(ByteEncoderTest, SimpleTokenization2) {
   const ByteEncoder encoder;
   {
     std::vector<int64_t> encoded_text;