diff --git a/tests/unit/src/com/android/settings/localepicker/TermsOfAddressFeminineControllerTest.java b/tests/unit/src/com/android/settings/localepicker/TermsOfAddressFeminineControllerTest.java
index 246fad62af9..215e58f6dc8 100644
--- a/tests/unit/src/com/android/settings/localepicker/TermsOfAddressFeminineControllerTest.java
+++ b/tests/unit/src/com/android/settings/localepicker/TermsOfAddressFeminineControllerTest.java
@@ -18,8 +18,6 @@ package com.android.settings.localepicker;
 
 import static com.google.common.truth.Truth.assertThat;
 
-import static org.mockito.Mockito.spy;
-
 import android.app.GrammaticalInflectionManager;
 import android.content.Context;
 import android.content.res.Configuration;
@@ -34,7 +32,6 @@ import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.android.settings.widget.TickButtonPreference;
 
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.MockitoAnnotations;
@@ -62,7 +59,7 @@ public class TermsOfAddressFeminineControllerTest {
     @Before
     public void setUp() throws Exception {
         MockitoAnnotations.initMocks(this);
-        mContext = spy(ApplicationProvider.getApplicationContext());
+        mContext = ApplicationProvider.getApplicationContext();
 
         if (Looper.myLooper() == null) {
             Looper.prepare();
@@ -93,7 +90,6 @@ public class TermsOfAddressFeminineControllerTest {
     }
 
     @Test
-    @Ignore("b/339543490")
     public void displayPreference_setGrammaticalGenderIsFeminine_FeminineIsSelected() {
         TickButtonPreference selectedPreference =
                 (TickButtonPreference) mPreferenceScreen.getPreference(2);
diff --git a/tests/unit/src/com/android/settings/localepicker/TermsOfAddressMasculineControllerTest.java b/tests/unit/src/com/android/settings/localepicker/TermsOfAddressMasculineControllerTest.java
index f5ed3959b76..b4c88937d8e 100644
--- a/tests/unit/src/com/android/settings/localepicker/TermsOfAddressMasculineControllerTest.java
+++ b/tests/unit/src/com/android/settings/localepicker/TermsOfAddressMasculineControllerTest.java
@@ -18,8 +18,6 @@ package com.android.settings.localepicker;
 
 import static com.google.common.truth.Truth.assertThat;
 
-import static org.mockito.Mockito.spy;
-
 import android.app.GrammaticalInflectionManager;
 import android.content.Context;
 import android.content.res.Configuration;
@@ -34,7 +32,6 @@ import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.android.settings.widget.TickButtonPreference;
 
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.MockitoAnnotations;
@@ -62,7 +59,7 @@ public class TermsOfAddressMasculineControllerTest {
     @Before
     public void setUp() throws Exception {
         MockitoAnnotations.initMocks(this);
-        mContext = spy(ApplicationProvider.getApplicationContext());
+        mContext = ApplicationProvider.getApplicationContext();
 
         if (Looper.myLooper() == null) {
             Looper.prepare();
@@ -93,7 +90,6 @@ public class TermsOfAddressMasculineControllerTest {
     }
 
     @Test
-    @Ignore("b/339543490")
     public void displayPreference_setGrammaticalGenderIsMasculine_MasculineIsSelected() {
         TickButtonPreference selectedPreference =
                 (TickButtonPreference) mPreferenceScreen.getPreference(3);
diff --git a/tests/unit/src/com/android/settings/localepicker/TermsOfAddressNeutralControllerTest.java b/tests/unit/src/com/android/settings/localepicker/TermsOfAddressNeutralControllerTest.java
index 0e53198188e..76aed0ac9ac 100644
--- a/tests/unit/src/com/android/settings/localepicker/TermsOfAddressNeutralControllerTest.java
+++ b/tests/unit/src/com/android/settings/localepicker/TermsOfAddressNeutralControllerTest.java
@@ -18,8 +18,6 @@ package com.android.settings.localepicker;
 
 import static com.google.common.truth.Truth.assertThat;
 
-import static org.mockito.Mockito.spy;
-
 import android.app.GrammaticalInflectionManager;
 import android.content.Context;
 import android.content.res.Configuration;
@@ -34,7 +32,6 @@ import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.android.settings.widget.TickButtonPreference;
 
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.MockitoAnnotations;
@@ -62,7 +59,7 @@ public class TermsOfAddressNeutralControllerTest {
     @Before
     public void setUp() throws Exception {
         MockitoAnnotations.initMocks(this);
-        mContext = spy(ApplicationProvider.getApplicationContext());
+        mContext = ApplicationProvider.getApplicationContext();
 
         if (Looper.myLooper() == null) {
             Looper.prepare();
@@ -93,7 +90,6 @@ public class TermsOfAddressNeutralControllerTest {
     }
 
     @Test
-    @Ignore("b/339543490")
     public void displayPreference_setGrammaticalGenderIsNotSpecified_NeutralIsSelected() {
         TickButtonPreference selectedPreference =
                 (TickButtonPreference) mPreferenceScreen.getPreference(4);
diff --git a/tests/unit/src/com/android/settings/localepicker/TermsOfAddressNotSpecifiedControllerTest.java b/tests/unit/src/com/android/settings/localepicker/TermsOfAddressNotSpecifiedControllerTest.java
index 96bac08dde1..0f51b7dfff9 100644
--- a/tests/unit/src/com/android/settings/localepicker/TermsOfAddressNotSpecifiedControllerTest.java
+++ b/tests/unit/src/com/android/settings/localepicker/TermsOfAddressNotSpecifiedControllerTest.java
@@ -18,8 +18,6 @@ package com.android.settings.localepicker;
 
 import static com.google.common.truth.Truth.assertThat;
 
-import static org.mockito.Mockito.spy;
-
 import android.app.GrammaticalInflectionManager;
 import android.content.Context;
 import android.content.res.Configuration;
@@ -34,7 +32,6 @@ import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.android.settings.widget.TickButtonPreference;
 
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.MockitoAnnotations;
@@ -62,7 +59,7 @@ public class TermsOfAddressNotSpecifiedControllerTest {
     @Before
     public void setUp() throws Exception {
         MockitoAnnotations.initMocks(this);
-        mContext = spy(ApplicationProvider.getApplicationContext());
+        mContext = ApplicationProvider.getApplicationContext();
 
         if (Looper.myLooper() == null) {
             Looper.prepare();
@@ -93,7 +90,6 @@ public class TermsOfAddressNotSpecifiedControllerTest {
     }
 
     @Test
-    @Ignore("b/339543490")
     public void displayPreference_setGrammaticalGenderIsNotSpecified_NotSpecifiedIsSelected() {
         TickButtonPreference selectedPreference =
                 (TickButtonPreference) mPreferenceScreen.getPreference(1);