diff --git a/tests/unit/Android.mk b/tests/unit/Android.mk
index 060c3e11bcf..b75a592c85b 100644
--- a/tests/unit/Android.mk
+++ b/tests/unit/Android.mk
@@ -14,6 +14,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := \
     mockito-target-minus-junit4 \
     truth-prebuilt \
     ub-uiautomator \
+    espresso-intents-nodep \
 
 
 # Include all test java files.
diff --git a/tests/app/src/com/android/settings/CreateShortcutTest.java b/tests/unit/src/com/android/settings/CreateShortcutTest.java
similarity index 100%
rename from tests/app/src/com/android/settings/CreateShortcutTest.java
rename to tests/unit/src/com/android/settings/CreateShortcutTest.java
diff --git a/tests/app/src/com/android/settings/DisplaySettingsTest.java b/tests/unit/src/com/android/settings/DisplaySettingsTest.java
similarity index 99%
rename from tests/app/src/com/android/settings/DisplaySettingsTest.java
rename to tests/unit/src/com/android/settings/DisplaySettingsTest.java
index 888b7fdd240..b5cd7cf3354 100644
--- a/tests/app/src/com/android/settings/DisplaySettingsTest.java
+++ b/tests/unit/src/com/android/settings/DisplaySettingsTest.java
@@ -27,6 +27,7 @@ import android.support.test.InstrumentationRegistry;
 import android.support.test.filters.SmallTest;
 import android.support.test.runner.AndroidJUnit4;
 import android.support.test.uiautomator.UiDevice;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/tests/app/src/com/android/settings/EncryptionInterstitialTest.java b/tests/unit/src/com/android/settings/EncryptionInterstitialTest.java
similarity index 100%
rename from tests/app/src/com/android/settings/EncryptionInterstitialTest.java
rename to tests/unit/src/com/android/settings/EncryptionInterstitialTest.java
diff --git a/tests/app/src/com/android/settings/ManagedAccessSettingsLowRamTest.java b/tests/unit/src/com/android/settings/ManagedAccessSettingsLowRamTest.java
similarity index 99%
rename from tests/app/src/com/android/settings/ManagedAccessSettingsLowRamTest.java
rename to tests/unit/src/com/android/settings/ManagedAccessSettingsLowRamTest.java
index 95c1dcf8839..ad87850344b 100644
--- a/tests/app/src/com/android/settings/ManagedAccessSettingsLowRamTest.java
+++ b/tests/unit/src/com/android/settings/ManagedAccessSettingsLowRamTest.java
@@ -30,6 +30,7 @@ import android.provider.Settings;
 import android.support.test.InstrumentationRegistry;
 import android.support.test.filters.SmallTest;
 import android.support.test.runner.AndroidJUnit4;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/tests/app/src/com/android/settings/SettingsPreferenceFragmentTest.java b/tests/unit/src/com/android/settings/SettingsPreferenceFragmentTest.java
similarity index 90%
rename from tests/app/src/com/android/settings/SettingsPreferenceFragmentTest.java
rename to tests/unit/src/com/android/settings/SettingsPreferenceFragmentTest.java
index 30fc124dfa6..0e12e797365 100644
--- a/tests/app/src/com/android/settings/SettingsPreferenceFragmentTest.java
+++ b/tests/unit/src/com/android/settings/SettingsPreferenceFragmentTest.java
@@ -1,25 +1,22 @@
 package com.android.settings;
 
-import android.content.Intent;
-import android.content.Context;
+import static com.google.common.truth.Truth.assertThat;
 
 import android.app.Instrumentation;
+import android.content.Context;
+import android.content.Intent;
 import android.os.Bundle;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceGroupAdapter;
-import com.android.settings.accessibility.AccessibilitySettings;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
 import android.support.test.InstrumentationRegistry;
 import android.support.test.filters.SmallTest;
 import android.support.test.runner.AndroidJUnit4;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceGroupAdapter;
 
-import static android.support.test.espresso.Espresso.onView;
-import static android.support.test.espresso.assertion.ViewAssertions.matches;
-import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
-import static android.support.test.espresso.matcher.ViewMatchers.withText;
-import static com.google.common.truth.Truth.assertThat;
+import com.android.settings.accessibility.AccessibilitySettings;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
 @RunWith(AndroidJUnit4.class)
 @SmallTest
diff --git a/tests/app/src/com/android/settings/applications/PackageUtilTest.java b/tests/unit/src/com/android/settings/applications/PackageUtilTest.java
similarity index 100%
rename from tests/app/src/com/android/settings/applications/PackageUtilTest.java
rename to tests/unit/src/com/android/settings/applications/PackageUtilTest.java
diff --git a/tests/app/src/com/android/settings/bluetooth/BluetoothDeviceDetailsRotationTest.java b/tests/unit/src/com/android/settings/bluetooth/BluetoothDeviceDetailsRotationTest.java
similarity index 100%
rename from tests/app/src/com/android/settings/bluetooth/BluetoothDeviceDetailsRotationTest.java
rename to tests/unit/src/com/android/settings/bluetooth/BluetoothDeviceDetailsRotationTest.java
diff --git a/tests/app/src/com/android/settings/bluetooth/DevicePickerActivityTest.java b/tests/unit/src/com/android/settings/bluetooth/DevicePickerActivityTest.java
similarity index 100%
rename from tests/app/src/com/android/settings/bluetooth/DevicePickerActivityTest.java
rename to tests/unit/src/com/android/settings/bluetooth/DevicePickerActivityTest.java
diff --git a/tests/app/src/com/android/settings/fingerprint/FingerprintEnrollFinishTest.java b/tests/unit/src/com/android/settings/fingerprint/FingerprintEnrollFinishTest.java
similarity index 100%
rename from tests/app/src/com/android/settings/fingerprint/FingerprintEnrollFinishTest.java
rename to tests/unit/src/com/android/settings/fingerprint/FingerprintEnrollFinishTest.java
diff --git a/tests/app/src/com/android/settings/notification/AppNotificationSettingsTest.java b/tests/unit/src/com/android/settings/notification/AppNotificationSettingsTest.java
similarity index 100%
rename from tests/app/src/com/android/settings/notification/AppNotificationSettingsTest.java
rename to tests/unit/src/com/android/settings/notification/AppNotificationSettingsTest.java
diff --git a/tests/app/src/com/android/settings/search/SearchFragmentEspressoTest.java b/tests/unit/src/com/android/settings/search/SearchFragmentEspressoTest.java
similarity index 99%
rename from tests/app/src/com/android/settings/search/SearchFragmentEspressoTest.java
rename to tests/unit/src/com/android/settings/search/SearchFragmentEspressoTest.java
index d3428819155..e89dc9ef1b4 100644
--- a/tests/app/src/com/android/settings/search/SearchFragmentEspressoTest.java
+++ b/tests/unit/src/com/android/settings/search/SearchFragmentEspressoTest.java
@@ -17,24 +17,26 @@
 
 package com.android.settings.search;
 
+import static android.support.test.espresso.Espresso.onView;
+import static android.support.test.espresso.assertion.ViewAssertions.matches;
+import static android.support.test.espresso.matcher.ViewMatchers.hasFocus;
+import static android.support.test.espresso.matcher.ViewMatchers.withClassName;
+import static android.support.test.espresso.matcher.ViewMatchers.withId;
+
+import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.core.AllOf.allOf;
+
 import android.support.test.filters.SmallTest;
 import android.support.test.rule.ActivityTestRule;
 import android.support.test.runner.AndroidJUnit4;
 import android.widget.SearchView;
+
+import com.android.settings.R;
+
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import static android.support.test.espresso.Espresso.onView;
-import static android.support.test.espresso.matcher.ViewMatchers.hasFocus;
-import static android.support.test.espresso.matcher.ViewMatchers.withClassName;
-import static android.support.test.espresso.matcher.ViewMatchers.withId;
-import static android.support.test.espresso.assertion.ViewAssertions.matches;
-import static org.hamcrest.Matchers.containsString;
-import static org.hamcrest.core.AllOf.allOf;
-
-import com.android.settings.R;
-
 
 @RunWith(AndroidJUnit4.class)
 @SmallTest
diff --git a/tests/app/src/com/android/settings/tests/PrivateVolumeSettingsTest.java b/tests/unit/src/com/android/settings/tests/PrivateVolumeSettingsTest.java
similarity index 96%
rename from tests/app/src/com/android/settings/tests/PrivateVolumeSettingsTest.java
rename to tests/unit/src/com/android/settings/tests/PrivateVolumeSettingsTest.java
index 6289f1b449a..ead20cb0f6b 100644
--- a/tests/app/src/com/android/settings/tests/PrivateVolumeSettingsTest.java
+++ b/tests/unit/src/com/android/settings/tests/PrivateVolumeSettingsTest.java
@@ -20,8 +20,6 @@ import android.content.Intent;
 import android.support.test.InstrumentationRegistry;
 import android.support.test.filters.SmallTest;
 import android.support.test.runner.AndroidJUnit4;
-import com.android.settings.Settings;
-import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
diff --git a/tests/app/src/com/android/settings/tests/SettingsRestoreAfterCloseTest.java b/tests/unit/src/com/android/settings/tests/SettingsRestoreAfterCloseTest.java
similarity index 100%
rename from tests/app/src/com/android/settings/tests/SettingsRestoreAfterCloseTest.java
rename to tests/unit/src/com/android/settings/tests/SettingsRestoreAfterCloseTest.java
diff --git a/tests/app/src/com/android/settings/users/UserSettingsTest.java b/tests/unit/src/com/android/settings/users/UserSettingsTest.java
similarity index 98%
rename from tests/app/src/com/android/settings/users/UserSettingsTest.java
rename to tests/unit/src/com/android/settings/users/UserSettingsTest.java
index 06e2bdde3f1..213183a9b00 100644
--- a/tests/app/src/com/android/settings/users/UserSettingsTest.java
+++ b/tests/unit/src/com/android/settings/users/UserSettingsTest.java
@@ -24,8 +24,6 @@ import android.support.test.uiautomator.UiSelector;
 import android.support.test.uiautomator.UiScrollable;
 import android.test.InstrumentationTestCase;
 
-import com.android.settings.R;
-
 import org.junit.Test;
 
 @SmallTest