diff --git a/tests/robotests/Android.mk b/tests/robotests/Android.mk
index ba3d086bffa..ff0ddb19979 100644
--- a/tests/robotests/Android.mk
+++ b/tests/robotests/Android.mk
@@ -6,7 +6,8 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE := SettingsRoboTests
 
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
+LOCAL_SRC_FILES := $(call all-java-files-under, src) \
+    $(call all-java-files-under, ../../../../../frameworks/base/packages/SettingsLib/tests/robotests/src/com/android/settingslib/testutils)
 
 LOCAL_JAVA_RESOURCE_DIRS := config
 
diff --git a/tests/robotests/src/com/android/settings/applications/ApplicationFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/applications/ApplicationFeatureProviderImplTest.java
index 1eb7fb81cac..89cf6a065fd 100644
--- a/tests/robotests/src/com/android/settings/applications/ApplicationFeatureProviderImplTest.java
+++ b/tests/robotests/src/com/android/settings/applications/ApplicationFeatureProviderImplTest.java
@@ -35,8 +35,8 @@ import android.os.UserManager;
 
 import com.android.settings.testutils.ApplicationTestUtils;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.shadow.ShadowDefaultDialerManager;
-import com.android.settings.testutils.shadow.ShadowSmsApplication;
+import com.android.settingslib.testutils.shadow.ShadowDefaultDialerManager;
+import com.android.settingslib.testutils.shadow.ShadowSmsApplication;
 
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDefaultDialerManager.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDefaultDialerManager.java
deleted file mode 100644
index ec4d788b9c1..00000000000
--- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDefaultDialerManager.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.testutils.shadow;
-
-import android.content.Context;
-import android.telecom.DefaultDialerManager;
-
-import org.robolectric.annotation.Implementation;
-import org.robolectric.annotation.Implements;
-import org.robolectric.annotation.Resetter;
-
-@Implements(DefaultDialerManager.class)
-public class ShadowDefaultDialerManager {
-
-    private static String sDefaultDailer;
-
-    @Resetter
-    public void reset() {
-        sDefaultDailer = null;
-    }
-
-    @Implementation
-    public static String getDefaultDialerApplication(Context context) {
-        return sDefaultDailer;
-    }
-
-    public static void setDefaultDialerApplication(String dialer) {
-        sDefaultDailer = dialer;
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowSmsApplication.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowSmsApplication.java
deleted file mode 100644
index 8e0c013f674..00000000000
--- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowSmsApplication.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.testutils.shadow;
-
-import android.content.ComponentName;
-import android.content.Context;
-
-import com.android.internal.telephony.SmsApplication;
-
-import org.robolectric.annotation.Implementation;
-import org.robolectric.annotation.Implements;
-import org.robolectric.annotation.Resetter;
-
-@Implements(SmsApplication.class)
-public class ShadowSmsApplication {
-
-    private static ComponentName sDefaultSmsApplication;
-
-    @Resetter
-    public void reset() {
-        sDefaultSmsApplication = null;
-    }
-
-    @Implementation
-    public static ComponentName getDefaultSmsApplication(Context context, boolean updateIfNeeded) {
-        return sDefaultSmsApplication;
-    }
-
-    public static void setDefaultSmsApplication(ComponentName cn) {
-        sDefaultSmsApplication = cn;
-    }
-}