diff --git a/TEST_MAPPING b/TEST_MAPPING
index 3e3251269ca..4865e19248b 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -9,12 +9,7 @@
       ]
     },
     {
-      "name": "SettingsPrefTests",
-      "options": [
-        {
-          "exclude-annotation": "androidx.test.filters.FlakyTest"
-        }
-      ]
+      "name": "SettingsPerfTests"
     }
   ]
 }
diff --git a/tests/perftests/Android.bp b/tests/perftests/Android.bp
index 961acb21df0..1ba5d9c432a 100644
--- a/tests/perftests/Android.bp
+++ b/tests/perftests/Android.bp
@@ -1,5 +1,5 @@
 android_test {
-    name: "SettingsPrefTests",
+    name: "SettingsPerfTests",
 
     certificate: "platform",
 
diff --git a/tests/perftests/AndroidManifest.xml b/tests/perftests/AndroidManifest.xml
index 902090a87c8..4ce6a54048c 100644
--- a/tests/perftests/AndroidManifest.xml
+++ b/tests/perftests/AndroidManifest.xml
@@ -15,7 +15,7 @@
 -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.settings.tests.pref">
+    package="com.android.settings.tests.perf">
 
     <application>
         <uses-library android:name="android.test.runner" />
diff --git a/tests/perftests/src/com/android/settings/tests/pref/LaunchSettingsTest.java b/tests/perftests/src/com/android/settings/tests/perf/LaunchSettingsTest.java
similarity index 97%
rename from tests/perftests/src/com/android/settings/tests/pref/LaunchSettingsTest.java
rename to tests/perftests/src/com/android/settings/tests/perf/LaunchSettingsTest.java
index 9e035cd9114..5140be2db91 100644
--- a/tests/perftests/src/com/android/settings/tests/pref/LaunchSettingsTest.java
+++ b/tests/perftests/src/com/android/settings/tests/perf/LaunchSettingsTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.settings.tests.pref;
+package com.android.settings.tests.perf;
 
 import android.app.Instrumentation;
 import android.os.Bundle;