diff --git a/TEST_MAPPING b/TEST_MAPPING
index fd6bcbf2851..f84565fa8ed 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -14,6 +14,9 @@
         },
         {
           "include-filter": "com.android.settings.password"
+        },
+	 {
+          "include-filter": "com.android.settings.privatespace"
         },
         {
           "include-filter": "com.android.settings.safetycenter"
diff --git a/tests/unit/src/com/android/settings/privatespace/FaceFingerprintUnlockControllerTest.java b/tests/unit/src/com/android/settings/privatespace/FaceFingerprintUnlockControllerTest.java
index 857135f419f..f6242ef868d 100644
--- a/tests/unit/src/com/android/settings/privatespace/FaceFingerprintUnlockControllerTest.java
+++ b/tests/unit/src/com/android/settings/privatespace/FaceFingerprintUnlockControllerTest.java
@@ -35,6 +35,7 @@ import com.android.settings.testutils.FakeFeatureFactory;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -71,6 +72,7 @@ public class FaceFingerprintUnlockControllerTest {
     }
 
     /** Tests that the controller is always available. */
+    @Ignore("b/323652985")
     @Test
     public void getAvailabilityStatus_whenFlagsEnabled_returnsAvailable() {
         mSetFlagsRule.enableFlags(
@@ -131,6 +133,7 @@ public class FaceFingerprintUnlockControllerTest {
     }
 
     /** Tests that preference is enabled and summary is not same as device lock. */
+    @Ignore("b/323652985")
     @Test
     public void getSummary_whenSeparateProfileLock() {
         doReturn(true).when(mLockPatternUtils).isSeparateProfileChallengeEnabled(anyInt());
diff --git a/tests/unit/src/com/android/settings/privatespace/UseOneLockControllerTest.java b/tests/unit/src/com/android/settings/privatespace/UseOneLockControllerTest.java
index 5c2a15cbd05..d029552ee0a 100644
--- a/tests/unit/src/com/android/settings/privatespace/UseOneLockControllerTest.java
+++ b/tests/unit/src/com/android/settings/privatespace/UseOneLockControllerTest.java
@@ -40,6 +40,7 @@ import com.android.settings.privatespace.onelock.UseOneLockController;
 import com.android.settings.testutils.FakeFeatureFactory;
 
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -82,6 +83,7 @@ public class UseOneLockControllerTest {
 
 
     /** Tests that summary in controller is Pattern. */
+    @Ignore("b/323652985")
     @Test
     public void getSummary_whenProfileLockPattern() {
         doReturn(true)
@@ -96,6 +98,7 @@ public class UseOneLockControllerTest {
     }
 
     /** Tests that summary in controller is PIN. */
+    @Ignore("b/323652985")
     @Test
     public void getSummary_whenProfileLockPin() {
         doReturn(true)
@@ -109,6 +112,7 @@ public class UseOneLockControllerTest {
     }
 
     /** Tests that summary in controller is Password. */
+    @Ignore("b/323652985")
     @Test
     public void getSummary_whenProfileLockPassword() {
         doReturn(true)