--- a/mobile/android/app/build.gradle
+++ b/mobile/android/app/build.gradle
@@ -186,25 +186,27 @@ android {
         }
 
         release {
             manifest.srcFile "${project.buildDir}/generated/source/preprocessed_manifest/AndroidManifest.xml"
         }
 
         test {
             java {
-                srcDir "${topsrcdir}/mobile/android/tests/background/junit4/src"
+                // Bug 1229149 tracks pushing this into a :services Gradle project.
+                srcDir "${topsrcdir}/mobile/android/services/src/test/java"
 
                 if (!mozconfig.substs.MOZ_ANDROID_GCM) {
                     exclude 'org/mozilla/gecko/gcm/**/*.java'
                     exclude 'org/mozilla/gecko/push/**/*.java'
                 }
             }
             resources {
-                srcDir "${topsrcdir}/mobile/android/tests/background/junit4/resources"
+                // Bug 1229149 tracks pushing this into a :services Gradle project.
+                srcDir "${topsrcdir}/mobile/android/services/src/test/resources"
             }
         }
 
         androidTest {
             java {
                 srcDir "${topsrcdir}/mobile/android/tests/browser/robocop/src"
                 srcDir "${topsrcdir}/mobile/android/tests/background/junit3/src"
                 srcDir "${topsrcdir}/mobile/android/tests/browser/junit3/src"

rename from mobile/android/tests/background/junit4/src/com/keepsafe/switchboard/TestSwitchboard.java
rename to mobile/android/app/src/test/java/com/keepsafe/switchboard/TestSwitchboard.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/GeckoNetworkManagerTest.java
rename to mobile/android/app/src/test/java/org/mozilla/gecko/GeckoNetworkManagerTest.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/GlobalPageMetadataTest.java
rename to mobile/android/app/src/test/java/org/mozilla/gecko/GlobalPageMetadataTest.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/TestGeckoProfile.java
rename to mobile/android/app/src/test/java/org/mozilla/gecko/TestGeckoProfile.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/activitystream/homepanel/TestActivityStreamConfiguration.java
rename to mobile/android/app/src/test/java/org/mozilla/gecko/activitystream/homepanel/TestActivityStreamConfiguration.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/activitystream/homepanel/topstories/TestPocketStoriesLoader.java
rename to mobile/android/app/src/test/java/org/mozilla/gecko/activitystream/homepanel/topstories/TestPocketStoriesLoader.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/activitystream/ranking/TestHighlightsRanking.java
rename to mobile/android/app/src/test/java/org/mozilla/gecko/activitystream/ranking/TestHighlightsRanking.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/activitystream/ranking/TestRankingUtils.java
rename to mobile/android/app/src/test/java/org/mozilla/gecko/activitystream/ranking/TestRankingUtils.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/cleanup/TestFileCleanupController.java
rename to mobile/android/app/src/test/java/org/mozilla/gecko/cleanup/TestFileCleanupController.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/cleanup/TestFileCleanupService.java
rename to mobile/android/app/src/test/java/org/mozilla/gecko/cleanup/TestFileCleanupService.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/customtabs/TestCustomTabsActivity.java
rename to mobile/android/app/src/test/java/org/mozilla/gecko/customtabs/TestCustomTabsActivity.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/customtabs/TestIntentUtil.java
rename to mobile/android/app/src/test/java/org/mozilla/gecko/customtabs/TestIntentUtil.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/distribution/TestReferrerDescriptor.java
rename to mobile/android/app/src/test/java/org/mozilla/gecko/distribution/TestReferrerDescriptor.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/dlc/TestCleanupAction.java
rename to mobile/android/app/src/test/java/org/mozilla/gecko/dlc/TestCleanupAction.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/dlc/TestDownloadAction.java
rename to mobile/android/app/src/test/java/org/mozilla/gecko/dlc/TestDownloadAction.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/dlc/TestStudyAction.java
rename to mobile/android/app/src/test/java/org/mozilla/gecko/dlc/TestStudyAction.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/dlc/TestSyncAction.java
rename to mobile/android/app/src/test/java/org/mozilla/gecko/dlc/TestSyncAction.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/dlc/TestVerifyAction.java
rename to mobile/android/app/src/test/java/org/mozilla/gecko/dlc/TestVerifyAction.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/dlc/catalog/TestDownloadContentBuilder.java
rename to mobile/android/app/src/test/java/org/mozilla/gecko/dlc/catalog/TestDownloadContentBuilder.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/dlc/catalog/TestDownloadContentCatalog.java
rename to mobile/android/app/src/test/java/org/mozilla/gecko/dlc/catalog/TestDownloadContentCatalog.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/helpers/AssertUtil.java
rename to mobile/android/app/src/test/java/org/mozilla/gecko/helpers/AssertUtil.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/helpers/MockUserManager.java
rename to mobile/android/app/src/test/java/org/mozilla/gecko/helpers/MockUserManager.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/home/TestHomeConfigPrefsBackendMigration.java
rename to mobile/android/app/src/test/java/org/mozilla/gecko/home/TestHomeConfigPrefsBackendMigration.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/icons/TestIconDescriptor.java
rename to mobile/android/app/src/test/java/org/mozilla/gecko/icons/TestIconDescriptor.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/icons/TestIconDescriptorComparator.java
rename to mobile/android/app/src/test/java/org/mozilla/gecko/icons/TestIconDescriptorComparator.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/icons/TestIconRequest.java
rename to mobile/android/app/src/test/java/org/mozilla/gecko/icons/TestIconRequest.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/icons/TestIconRequestBuilder.java
rename to mobile/android/app/src/test/java/org/mozilla/gecko/icons/TestIconRequestBuilder.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/icons/TestIconResponse.java
rename to mobile/android/app/src/test/java/org/mozilla/gecko/icons/TestIconResponse.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/icons/TestIconTask.java
rename to mobile/android/app/src/test/java/org/mozilla/gecko/icons/TestIconTask.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/icons/TestIconsHelper.java
rename to mobile/android/app/src/test/java/org/mozilla/gecko/icons/TestIconsHelper.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/icons/loader/TestContentProviderLoader.java
rename to mobile/android/app/src/test/java/org/mozilla/gecko/icons/loader/TestContentProviderLoader.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/icons/loader/TestDataUriLoader.java
rename to mobile/android/app/src/test/java/org/mozilla/gecko/icons/loader/TestDataUriLoader.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/icons/loader/TestDiskLoader.java
rename to mobile/android/app/src/test/java/org/mozilla/gecko/icons/loader/TestDiskLoader.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/icons/loader/TestIconDownloader.java
rename to mobile/android/app/src/test/java/org/mozilla/gecko/icons/loader/TestIconDownloader.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/icons/loader/TestIconGenerator.java
rename to mobile/android/app/src/test/java/org/mozilla/gecko/icons/loader/TestIconGenerator.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/icons/loader/TestJarLoader.java
rename to mobile/android/app/src/test/java/org/mozilla/gecko/icons/loader/TestJarLoader.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/icons/loader/TestLegacyLoader.java
rename to mobile/android/app/src/test/java/org/mozilla/gecko/icons/loader/TestLegacyLoader.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/icons/loader/TestMemoryLoader.java
rename to mobile/android/app/src/test/java/org/mozilla/gecko/icons/loader/TestMemoryLoader.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/icons/loader/TestSuggestedSiteLoader.java
rename to mobile/android/app/src/test/java/org/mozilla/gecko/icons/loader/TestSuggestedSiteLoader.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/icons/preparation/TestAboutPagesPreparer.java
rename to mobile/android/app/src/test/java/org/mozilla/gecko/icons/preparation/TestAboutPagesPreparer.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/icons/preparation/TestAddDefaultIconUrl.java
rename to mobile/android/app/src/test/java/org/mozilla/gecko/icons/preparation/TestAddDefaultIconUrl.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/icons/preparation/TestFilterKnownFailureUrls.java
rename to mobile/android/app/src/test/java/org/mozilla/gecko/icons/preparation/TestFilterKnownFailureUrls.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/icons/preparation/TestFilterMimeTypes.java
rename to mobile/android/app/src/test/java/org/mozilla/gecko/icons/preparation/TestFilterMimeTypes.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/icons/preparation/TestFilterPrivilegedUrls.java
rename to mobile/android/app/src/test/java/org/mozilla/gecko/icons/preparation/TestFilterPrivilegedUrls.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/icons/preparation/TestLookupIconUrl.java
rename to mobile/android/app/src/test/java/org/mozilla/gecko/icons/preparation/TestLookupIconUrl.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/icons/preparation/TestSuggestedSitePreparer.java
rename to mobile/android/app/src/test/java/org/mozilla/gecko/icons/preparation/TestSuggestedSitePreparer.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/icons/processing/TestColorProcessor.java
rename to mobile/android/app/src/test/java/org/mozilla/gecko/icons/processing/TestColorProcessor.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/icons/processing/TestDiskProcessor.java
rename to mobile/android/app/src/test/java/org/mozilla/gecko/icons/processing/TestDiskProcessor.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/icons/processing/TestMemoryProcessor.java
rename to mobile/android/app/src/test/java/org/mozilla/gecko/icons/processing/TestMemoryProcessor.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/icons/processing/TestMinimumSizeProcessor.java
rename to mobile/android/app/src/test/java/org/mozilla/gecko/icons/processing/TestMinimumSizeProcessor.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/icons/processing/TestResizingProcessor.java
rename to mobile/android/app/src/test/java/org/mozilla/gecko/icons/processing/TestResizingProcessor.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/media/TestMediaControlService.java
rename to mobile/android/app/src/test/java/org/mozilla/gecko/media/TestMediaControlService.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/permissions/TestPermissions.java
rename to mobile/android/app/src/test/java/org/mozilla/gecko/permissions/TestPermissions.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/push/TestPushManager.java
rename to mobile/android/app/src/test/java/org/mozilla/gecko/push/TestPushManager.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/push/TestPushState.java
rename to mobile/android/app/src/test/java/org/mozilla/gecko/push/TestPushState.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/push/autopush/test/TestAutopushClient.java
rename to mobile/android/app/src/test/java/org/mozilla/gecko/push/autopush/test/TestAutopushClient.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/push/autopush/test/TestLiveAutopushClient.java
rename to mobile/android/app/src/test/java/org/mozilla/gecko/push/autopush/test/TestLiveAutopushClient.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/telemetry/measurements/TestSearchCountMeasurements.java
rename to mobile/android/app/src/test/java/org/mozilla/gecko/telemetry/measurements/TestSearchCountMeasurements.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/telemetry/measurements/TestSessionMeasurements.java
rename to mobile/android/app/src/test/java/org/mozilla/gecko/telemetry/measurements/TestSessionMeasurements.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/telemetry/pingbuilders/TelemetrySyncPingBuilderTest.java
rename to mobile/android/app/src/test/java/org/mozilla/gecko/telemetry/pingbuilders/TelemetrySyncPingBuilderTest.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/telemetry/pingbuilders/TelemetrySyncPingBundleBuilderTest.java
rename to mobile/android/app/src/test/java/org/mozilla/gecko/telemetry/pingbuilders/TelemetrySyncPingBundleBuilderTest.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/telemetry/pingbuilders/TestTelemetryPingBuilder.java
rename to mobile/android/app/src/test/java/org/mozilla/gecko/telemetry/pingbuilders/TestTelemetryPingBuilder.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/telemetry/schedulers/TestTelemetryUploadAllPingsImmediatelyScheduler.java
rename to mobile/android/app/src/test/java/org/mozilla/gecko/telemetry/schedulers/TestTelemetryUploadAllPingsImmediatelyScheduler.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/telemetry/stores/TestTelemetryJSONFilePingStore.java
rename to mobile/android/app/src/test/java/org/mozilla/gecko/telemetry/stores/TestTelemetryJSONFilePingStore.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/toolbar/TestSecurityModeUtil.java
rename to mobile/android/app/src/test/java/org/mozilla/gecko/toolbar/TestSecurityModeUtil.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/util/NetworkUtilsTest.java
rename to mobile/android/app/src/test/java/org/mozilla/gecko/util/NetworkUtilsTest.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/util/TestContextUtils.java
rename to mobile/android/app/src/test/java/org/mozilla/gecko/util/TestContextUtils.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/util/TestDateUtil.java
rename to mobile/android/app/src/test/java/org/mozilla/gecko/util/TestDateUtil.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/util/TestFileUtils.java
rename to mobile/android/app/src/test/java/org/mozilla/gecko/util/TestFileUtils.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/util/TestFloatUtils.java
rename to mobile/android/app/src/test/java/org/mozilla/gecko/util/TestFloatUtils.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/util/TestIntentUtils.java
rename to mobile/android/app/src/test/java/org/mozilla/gecko/util/TestIntentUtils.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/util/TestStringUtils.java
rename to mobile/android/app/src/test/java/org/mozilla/gecko/util/TestStringUtils.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/util/TestURIUtils.java
rename to mobile/android/app/src/test/java/org/mozilla/gecko/util/TestURIUtils.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/util/TestUUIDUtil.java
rename to mobile/android/app/src/test/java/org/mozilla/gecko/util/TestUUIDUtil.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/util/publicsuffix/TestPublicSuffix.java
rename to mobile/android/app/src/test/java/org/mozilla/gecko/util/publicsuffix/TestPublicSuffix.java

rename from mobile/android/tests/background/junit4/resources/dlc_sync_deleted_item.json
rename to mobile/android/app/src/test/resources/dlc_sync_deleted_item.json

rename from mobile/android/tests/background/junit4/resources/dlc_sync_old_format.json
rename to mobile/android/app/src/test/resources/dlc_sync_old_format.json

rename from mobile/android/tests/background/junit4/resources/dlc_sync_single_font.json
rename to mobile/android/app/src/test/resources/dlc_sync_single_font.json

rename from mobile/android/tests/background/junit4/resources/experiments.json
rename to mobile/android/app/src/test/resources/experiments.json

rename from mobile/android/tests/background/junit4/resources/feed_atom_blogger.xml
rename to mobile/android/app/src/test/resources/feed_atom_blogger.xml

rename from mobile/android/tests/background/junit4/resources/feed_atom_feedburner.xml
rename to mobile/android/app/src/test/resources/feed_atom_feedburner.xml

rename from mobile/android/tests/background/junit4/resources/feed_atom_planetmozilla.xml
rename to mobile/android/app/src/test/resources/feed_atom_planetmozilla.xml

rename from mobile/android/tests/background/junit4/resources/feed_atom_wikipedia.xml
rename to mobile/android/app/src/test/resources/feed_atom_wikipedia.xml

rename from mobile/android/tests/background/junit4/resources/feed_rss10_planetmozilla.xml
rename to mobile/android/app/src/test/resources/feed_rss10_planetmozilla.xml

rename from mobile/android/tests/background/junit4/resources/feed_rss20_planetmozilla.xml
rename to mobile/android/app/src/test/resources/feed_rss20_planetmozilla.xml

rename from mobile/android/tests/background/junit4/resources/feed_rss_heise.xml
rename to mobile/android/app/src/test/resources/feed_rss_heise.xml

rename from mobile/android/tests/background/junit4/resources/feed_rss_medium.xml
rename to mobile/android/app/src/test/resources/feed_rss_medium.xml

rename from mobile/android/tests/background/junit4/resources/feed_rss_spon.xml
rename to mobile/android/app/src/test/resources/feed_rss_spon.xml

rename from mobile/android/tests/background/junit4/resources/feed_rss_tumblr.xml
rename to mobile/android/app/src/test/resources/feed_rss_tumblr.xml

rename from mobile/android/tests/background/junit4/resources/feed_rss_wikipedia.xml
rename to mobile/android/app/src/test/resources/feed_rss_wikipedia.xml

rename from mobile/android/tests/background/junit4/resources/feed_rss_wordpress.xml
rename to mobile/android/app/src/test/resources/feed_rss_wordpress.xml

rename from mobile/android/tests/background/junit4/resources/robolectric.properties
rename to mobile/android/app/src/test/resources/robolectric.properties

rename from mobile/android/tests/background/junit4/src/org/mozilla/android/sync/net/test/TestBackoff.java
rename to mobile/android/services/src/test/java/org/mozilla/android/sync/net/test/TestBackoff.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/android/sync/net/test/TestBrowserIDAuthHeaderProvider.java
rename to mobile/android/services/src/test/java/org/mozilla/android/sync/net/test/TestBrowserIDAuthHeaderProvider.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/android/sync/net/test/TestClientsEngineStage.java
rename to mobile/android/services/src/test/java/org/mozilla/android/sync/net/test/TestClientsEngineStage.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/android/sync/net/test/TestCredentialsEndToEnd.java
rename to mobile/android/services/src/test/java/org/mozilla/android/sync/net/test/TestCredentialsEndToEnd.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/android/sync/net/test/TestGlobalSession.java
rename to mobile/android/services/src/test/java/org/mozilla/android/sync/net/test/TestGlobalSession.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/android/sync/net/test/TestHeaderParsing.java
rename to mobile/android/services/src/test/java/org/mozilla/android/sync/net/test/TestHeaderParsing.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/android/sync/net/test/TestLineByLineHandling.java
rename to mobile/android/services/src/test/java/org/mozilla/android/sync/net/test/TestLineByLineHandling.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/android/sync/net/test/TestMetaGlobal.java
rename to mobile/android/services/src/test/java/org/mozilla/android/sync/net/test/TestMetaGlobal.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/android/sync/net/test/TestResource.java
rename to mobile/android/services/src/test/java/org/mozilla/android/sync/net/test/TestResource.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/android/sync/net/test/TestRetryAfter.java
rename to mobile/android/services/src/test/java/org/mozilla/android/sync/net/test/TestRetryAfter.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/android/sync/net/test/TestServer15Repository.java
rename to mobile/android/services/src/test/java/org/mozilla/android/sync/net/test/TestServer15Repository.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/android/sync/net/test/TestSyncStorageRequest.java
rename to mobile/android/services/src/test/java/org/mozilla/android/sync/net/test/TestSyncStorageRequest.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/android/sync/test/SynchronizerHelpers.java
rename to mobile/android/services/src/test/java/org/mozilla/android/sync/test/SynchronizerHelpers.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/android/sync/test/TestCollectionKeys.java
rename to mobile/android/services/src/test/java/org/mozilla/android/sync/test/TestCollectionKeys.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/android/sync/test/TestCommandProcessor.java
rename to mobile/android/services/src/test/java/org/mozilla/android/sync/test/TestCommandProcessor.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/android/sync/test/TestCryptoRecord.java
rename to mobile/android/services/src/test/java/org/mozilla/android/sync/test/TestCryptoRecord.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/android/sync/test/TestRecord.java
rename to mobile/android/services/src/test/java/org/mozilla/android/sync/test/TestRecord.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/android/sync/test/TestRecordsChannel.java
rename to mobile/android/services/src/test/java/org/mozilla/android/sync/test/TestRecordsChannel.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/android/sync/test/TestResetCommands.java
rename to mobile/android/services/src/test/java/org/mozilla/android/sync/test/TestResetCommands.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/android/sync/test/TestServer15RepositorySession.java
rename to mobile/android/services/src/test/java/org/mozilla/android/sync/test/TestServer15RepositorySession.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/android/sync/test/TestServerLocalSynchronizer.java
rename to mobile/android/services/src/test/java/org/mozilla/android/sync/test/TestServerLocalSynchronizer.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/android/sync/test/TestSynchronizer.java
rename to mobile/android/services/src/test/java/org/mozilla/android/sync/test/TestSynchronizer.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/android/sync/test/TestSynchronizerSession.java
rename to mobile/android/services/src/test/java/org/mozilla/android/sync/test/TestSynchronizerSession.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/android/sync/test/TestUtils.java
rename to mobile/android/services/src/test/java/org/mozilla/android/sync/test/TestUtils.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/android/sync/test/helpers/BaseTestStorageRequestDelegate.java
rename to mobile/android/services/src/test/java/org/mozilla/android/sync/test/helpers/BaseTestStorageRequestDelegate.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/android/sync/test/helpers/ExpectSuccessDelegate.java
rename to mobile/android/services/src/test/java/org/mozilla/android/sync/test/helpers/ExpectSuccessDelegate.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/android/sync/test/helpers/ExpectSuccessRepositorySessionBeginDelegate.java
rename to mobile/android/services/src/test/java/org/mozilla/android/sync/test/helpers/ExpectSuccessRepositorySessionBeginDelegate.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/android/sync/test/helpers/ExpectSuccessRepositorySessionCreationDelegate.java
rename to mobile/android/services/src/test/java/org/mozilla/android/sync/test/helpers/ExpectSuccessRepositorySessionCreationDelegate.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/android/sync/test/helpers/ExpectSuccessRepositorySessionFetchRecordsDelegate.java
rename to mobile/android/services/src/test/java/org/mozilla/android/sync/test/helpers/ExpectSuccessRepositorySessionFetchRecordsDelegate.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/android/sync/test/helpers/ExpectSuccessRepositorySessionFinishDelegate.java
rename to mobile/android/services/src/test/java/org/mozilla/android/sync/test/helpers/ExpectSuccessRepositorySessionFinishDelegate.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/android/sync/test/helpers/ExpectSuccessRepositorySessionStoreDelegate.java
rename to mobile/android/services/src/test/java/org/mozilla/android/sync/test/helpers/ExpectSuccessRepositorySessionStoreDelegate.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/android/sync/test/helpers/ExpectSuccessRepositoryWipeDelegate.java
rename to mobile/android/services/src/test/java/org/mozilla/android/sync/test/helpers/ExpectSuccessRepositoryWipeDelegate.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/android/sync/test/helpers/HTTPServerTestHelper.java
rename to mobile/android/services/src/test/java/org/mozilla/android/sync/test/helpers/HTTPServerTestHelper.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/android/sync/test/helpers/MockGlobalSessionCallback.java
rename to mobile/android/services/src/test/java/org/mozilla/android/sync/test/helpers/MockGlobalSessionCallback.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/android/sync/test/helpers/MockResourceDelegate.java
rename to mobile/android/services/src/test/java/org/mozilla/android/sync/test/helpers/MockResourceDelegate.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/android/sync/test/helpers/MockServer.java
rename to mobile/android/services/src/test/java/org/mozilla/android/sync/test/helpers/MockServer.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/android/sync/test/helpers/MockSyncClientsEngineStage.java
rename to mobile/android/services/src/test/java/org/mozilla/android/sync/test/helpers/MockSyncClientsEngineStage.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/android/sync/test/helpers/MockWBOServer.java
rename to mobile/android/services/src/test/java/org/mozilla/android/sync/test/helpers/MockWBOServer.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/android/sync/test/helpers/test/TestHTTPServerTestHelper.java
rename to mobile/android/services/src/test/java/org/mozilla/android/sync/test/helpers/test/TestHTTPServerTestHelper.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/background/common/log/writers/test/TestLogWriters.java
rename to mobile/android/services/src/test/java/org/mozilla/gecko/background/common/log/writers/test/TestLogWriters.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/background/db/DelegatingTestContentProvider.java
rename to mobile/android/services/src/test/java/org/mozilla/gecko/background/db/DelegatingTestContentProvider.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/background/db/TestTabsProvider.java
rename to mobile/android/services/src/test/java/org/mozilla/gecko/background/db/TestTabsProvider.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/background/fxa/test/TestFxAccountClient20.java
rename to mobile/android/services/src/test/java/org/mozilla/gecko/background/fxa/test/TestFxAccountClient20.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/background/fxa/test/TestFxAccountUtils.java
rename to mobile/android/services/src/test/java/org/mozilla/gecko/background/fxa/test/TestFxAccountUtils.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/background/test/EntityTestHelper.java
rename to mobile/android/services/src/test/java/org/mozilla/gecko/background/test/EntityTestHelper.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/background/testhelpers/BaseMockServerSyncStage.java
rename to mobile/android/services/src/test/java/org/mozilla/gecko/background/testhelpers/BaseMockServerSyncStage.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/background/testhelpers/CommandHelpers.java
rename to mobile/android/services/src/test/java/org/mozilla/gecko/background/testhelpers/CommandHelpers.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/background/testhelpers/DefaultGlobalSessionCallback.java
rename to mobile/android/services/src/test/java/org/mozilla/gecko/background/testhelpers/DefaultGlobalSessionCallback.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/background/testhelpers/MockAbstractNonRepositorySyncStage.java
rename to mobile/android/services/src/test/java/org/mozilla/gecko/background/testhelpers/MockAbstractNonRepositorySyncStage.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/background/testhelpers/MockClientsDataDelegate.java
rename to mobile/android/services/src/test/java/org/mozilla/gecko/background/testhelpers/MockClientsDataDelegate.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/background/testhelpers/MockClientsDatabaseAccessor.java
rename to mobile/android/services/src/test/java/org/mozilla/gecko/background/testhelpers/MockClientsDatabaseAccessor.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/background/testhelpers/MockGlobalSession.java
rename to mobile/android/services/src/test/java/org/mozilla/gecko/background/testhelpers/MockGlobalSession.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/background/testhelpers/MockPrefsGlobalSession.java
rename to mobile/android/services/src/test/java/org/mozilla/gecko/background/testhelpers/MockPrefsGlobalSession.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/background/testhelpers/MockRecord.java
rename to mobile/android/services/src/test/java/org/mozilla/gecko/background/testhelpers/MockRecord.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/background/testhelpers/MockServerSyncStage.java
rename to mobile/android/services/src/test/java/org/mozilla/gecko/background/testhelpers/MockServerSyncStage.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/background/testhelpers/MockSharedPreferences.java
rename to mobile/android/services/src/test/java/org/mozilla/gecko/background/testhelpers/MockSharedPreferences.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/background/testhelpers/TestRunner.java
rename to mobile/android/services/src/test/java/org/mozilla/gecko/background/testhelpers/TestRunner.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/background/testhelpers/WBORepository.java
rename to mobile/android/services/src/test/java/org/mozilla/gecko/background/testhelpers/WBORepository.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/background/testhelpers/WaitHelper.java
rename to mobile/android/services/src/test/java/org/mozilla/gecko/background/testhelpers/WaitHelper.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/browserid/test/TestASNUtils.java
rename to mobile/android/services/src/test/java/org/mozilla/gecko/browserid/test/TestASNUtils.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/browserid/test/TestDSACryptoImplementation.java
rename to mobile/android/services/src/test/java/org/mozilla/gecko/browserid/test/TestDSACryptoImplementation.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/browserid/test/TestJSONWebTokenUtils.java
rename to mobile/android/services/src/test/java/org/mozilla/gecko/browserid/test/TestJSONWebTokenUtils.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/browserid/test/TestRSACryptoImplementation.java
rename to mobile/android/services/src/test/java/org/mozilla/gecko/browserid/test/TestRSACryptoImplementation.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/db/BrowserContractTest.java
rename to mobile/android/services/src/test/java/org/mozilla/gecko/db/BrowserContractTest.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/db/BrowserDatabaseHelperTest.java
rename to mobile/android/services/src/test/java/org/mozilla/gecko/db/BrowserDatabaseHelperTest.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/db/BrowserProviderBookmarksTest.java
rename to mobile/android/services/src/test/java/org/mozilla/gecko/db/BrowserProviderBookmarksTest.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/db/BrowserProviderGeneralTest.java
rename to mobile/android/services/src/test/java/org/mozilla/gecko/db/BrowserProviderGeneralTest.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/db/BrowserProviderHistoryTest.java
rename to mobile/android/services/src/test/java/org/mozilla/gecko/db/BrowserProviderHistoryTest.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/db/BrowserProviderHistoryVisitsTest.java
rename to mobile/android/services/src/test/java/org/mozilla/gecko/db/BrowserProviderHistoryVisitsTest.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/db/BrowserProviderHistoryVisitsTestBase.java
rename to mobile/android/services/src/test/java/org/mozilla/gecko/db/BrowserProviderHistoryVisitsTestBase.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/db/BrowserProviderVisitsTest.java
rename to mobile/android/services/src/test/java/org/mozilla/gecko/db/BrowserProviderVisitsTest.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/db/LocalBrowserDBTest.java
rename to mobile/android/services/src/test/java/org/mozilla/gecko/db/LocalBrowserDBTest.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/fxa/TestSkewHandler.java
rename to mobile/android/services/src/test/java/org/mozilla/gecko/fxa/TestSkewHandler.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/fxa/authenticator/AndroidFxAccountTest.java
rename to mobile/android/services/src/test/java/org/mozilla/gecko/fxa/authenticator/AndroidFxAccountTest.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/fxa/devices/TestFxAccountDeviceListUpdater.java
rename to mobile/android/services/src/test/java/org/mozilla/gecko/fxa/devices/TestFxAccountDeviceListUpdater.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/fxa/devices/TestFxAccountDeviceRegistrator.java
rename to mobile/android/services/src/test/java/org/mozilla/gecko/fxa/devices/TestFxAccountDeviceRegistrator.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/fxa/login/MockFxAccountClient.java
rename to mobile/android/services/src/test/java/org/mozilla/gecko/fxa/login/MockFxAccountClient.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/fxa/login/TestFxAccountLoginStateMachine.java
rename to mobile/android/services/src/test/java/org/mozilla/gecko/fxa/login/TestFxAccountLoginStateMachine.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/fxa/login/TestStateFactory.java
rename to mobile/android/services/src/test/java/org/mozilla/gecko/fxa/login/TestStateFactory.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/sync/crypto/test/TestBase32.java
rename to mobile/android/services/src/test/java/org/mozilla/gecko/sync/crypto/test/TestBase32.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/sync/crypto/test/TestCryptoInfo.java
rename to mobile/android/services/src/test/java/org/mozilla/gecko/sync/crypto/test/TestCryptoInfo.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/sync/crypto/test/TestHKDF.java
rename to mobile/android/services/src/test/java/org/mozilla/gecko/sync/crypto/test/TestHKDF.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/sync/crypto/test/TestKeyBundle.java
rename to mobile/android/services/src/test/java/org/mozilla/gecko/sync/crypto/test/TestKeyBundle.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/sync/crypto/test/TestPBKDF2.java
rename to mobile/android/services/src/test/java/org/mozilla/gecko/sync/crypto/test/TestPBKDF2.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/sync/crypto/test/TestPersistedCrypto5Keys.java
rename to mobile/android/services/src/test/java/org/mozilla/gecko/sync/crypto/test/TestPersistedCrypto5Keys.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/sync/crypto/test/TestSRPConstants.java
rename to mobile/android/services/src/test/java/org/mozilla/gecko/sync/crypto/test/TestSRPConstants.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/sync/middleware/BufferingMiddlewareRepositorySessionTest.java
rename to mobile/android/services/src/test/java/org/mozilla/gecko/sync/middleware/BufferingMiddlewareRepositorySessionTest.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/sync/middleware/test/TestCrypto5MiddlewareRepositorySession.java
rename to mobile/android/services/src/test/java/org/mozilla/gecko/sync/middleware/test/TestCrypto5MiddlewareRepositorySession.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/sync/net/test/TestHMACAuthHeaderProvider.java
rename to mobile/android/services/src/test/java/org/mozilla/gecko/sync/net/test/TestHMACAuthHeaderProvider.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/sync/net/test/TestHawkAuthHeaderProvider.java
rename to mobile/android/services/src/test/java/org/mozilla/gecko/sync/net/test/TestHawkAuthHeaderProvider.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/sync/net/test/TestLiveHawkAuth.java
rename to mobile/android/services/src/test/java/org/mozilla/gecko/sync/net/test/TestLiveHawkAuth.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/sync/net/test/TestUserAgentHeaders.java
rename to mobile/android/services/src/test/java/org/mozilla/gecko/sync/net/test/TestUserAgentHeaders.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/sync/repositories/android/BookmarksSessionHelperTest.java
rename to mobile/android/services/src/test/java/org/mozilla/gecko/sync/repositories/android/BookmarksSessionHelperTest.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/sync/repositories/android/BrowserContractHelpersTest.java
rename to mobile/android/services/src/test/java/org/mozilla/gecko/sync/repositories/android/BrowserContractHelpersTest.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/sync/repositories/android/HistorySessionHelperTest.java
rename to mobile/android/services/src/test/java/org/mozilla/gecko/sync/repositories/android/HistorySessionHelperTest.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/sync/repositories/android/VisitsHelperTest.java
rename to mobile/android/services/src/test/java/org/mozilla/gecko/sync/repositories/android/VisitsHelperTest.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/sync/repositories/android/test/TestBookmarksInsertionManager.java
rename to mobile/android/services/src/test/java/org/mozilla/gecko/sync/repositories/android/test/TestBookmarksInsertionManager.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/sync/repositories/domain/TestClientRecord.java
rename to mobile/android/services/src/test/java/org/mozilla/gecko/sync/repositories/domain/TestClientRecord.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/sync/repositories/domain/test/TestFormHistoryRecord.java
rename to mobile/android/services/src/test/java/org/mozilla/gecko/sync/repositories/domain/test/TestFormHistoryRecord.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/sync/repositories/domain/test/TestPasswordRecord.java
rename to mobile/android/services/src/test/java/org/mozilla/gecko/sync/repositories/domain/test/TestPasswordRecord.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/sync/repositories/downloaders/BatchingDownloaderControllerTest.java
rename to mobile/android/services/src/test/java/org/mozilla/gecko/sync/repositories/downloaders/BatchingDownloaderControllerTest.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/sync/repositories/downloaders/BatchingDownloaderDelegateTest.java
rename to mobile/android/services/src/test/java/org/mozilla/gecko/sync/repositories/downloaders/BatchingDownloaderDelegateTest.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/sync/repositories/downloaders/BatchingDownloaderTest.java
rename to mobile/android/services/src/test/java/org/mozilla/gecko/sync/repositories/downloaders/BatchingDownloaderTest.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/sync/repositories/test/TestRepositorySessionBundle.java
rename to mobile/android/services/src/test/java/org/mozilla/gecko/sync/repositories/test/TestRepositorySessionBundle.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/sync/repositories/uploaders/BatchMetaTest.java
rename to mobile/android/services/src/test/java/org/mozilla/gecko/sync/repositories/uploaders/BatchMetaTest.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/sync/repositories/uploaders/BatchingUploaderTest.java
rename to mobile/android/services/src/test/java/org/mozilla/gecko/sync/repositories/uploaders/BatchingUploaderTest.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/sync/repositories/uploaders/PayloadTest.java
rename to mobile/android/services/src/test/java/org/mozilla/gecko/sync/repositories/uploaders/PayloadTest.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/sync/repositories/uploaders/PayloadUploadDelegateTest.java
rename to mobile/android/services/src/test/java/org/mozilla/gecko/sync/repositories/uploaders/PayloadUploadDelegateTest.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/sync/repositories/uploaders/RecordUploadRunnableTest.java
rename to mobile/android/services/src/test/java/org/mozilla/gecko/sync/repositories/uploaders/RecordUploadRunnableTest.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/sync/repositories/uploaders/UploaderMetaTest.java
rename to mobile/android/services/src/test/java/org/mozilla/gecko/sync/repositories/uploaders/UploaderMetaTest.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/sync/stage/test/TestEnsureCrypto5KeysStage.java
rename to mobile/android/services/src/test/java/org/mozilla/gecko/sync/stage/test/TestEnsureCrypto5KeysStage.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/sync/stage/test/TestFetchMetaGlobalStage.java
rename to mobile/android/services/src/test/java/org/mozilla/gecko/sync/stage/test/TestFetchMetaGlobalStage.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/sync/stage/test/TestStageLookup.java
rename to mobile/android/services/src/test/java/org/mozilla/gecko/sync/stage/test/TestStageLookup.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/sync/telemetry/TelemetryCollectorTest.java
rename to mobile/android/services/src/test/java/org/mozilla/gecko/sync/telemetry/TelemetryCollectorTest.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/sync/test/TestBookmarkValidator.java
rename to mobile/android/services/src/test/java/org/mozilla/gecko/sync/test/TestBookmarkValidator.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/sync/test/TestExtendedJSONObject.java
rename to mobile/android/services/src/test/java/org/mozilla/gecko/sync/test/TestExtendedJSONObject.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/sync/test/TestInfoCollections.java
rename to mobile/android/services/src/test/java/org/mozilla/gecko/sync/test/TestInfoCollections.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/sync/test/TestPersistedMetaGlobal.java
rename to mobile/android/services/src/test/java/org/mozilla/gecko/sync/test/TestPersistedMetaGlobal.java

rename from mobile/android/tests/background/junit4/src/org/mozilla/gecko/tokenserver/test/TestTokenServerClient.java
rename to mobile/android/services/src/test/java/org/mozilla/gecko/tokenserver/test/TestTokenServerClient.java