--- a/mobile/android/app/build.gradle
+++ b/mobile/android/app/build.gradle
@@ -203,17 +203,18 @@ android {
                 // 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"
+                // Bug 1229149 tracks pushing this into a :services Gradle project.
+                srcDir "${topsrcdir}/mobile/android/services/src/androidTest/java"
                 srcDir "${topsrcdir}/mobile/android/tests/browser/junit3/src"
             }
             res {
                 srcDir "${topsrcdir}/mobile/android/tests/browser/robocop/res"
             }
             assets {
                 srcDir "${topsrcdir}/mobile/android/tests/browser/robocop/assets"
             }

rename from mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/common/TestAndroidLogWriters.java
rename to mobile/android/services/src/androidTest/java/org/mozilla/gecko/background/common/TestAndroidLogWriters.java

rename from mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/common/TestUtils.java
rename to mobile/android/services/src/androidTest/java/org/mozilla/gecko/background/common/TestUtils.java

rename from mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/common/TestWaitHelper.java
rename to mobile/android/services/src/androidTest/java/org/mozilla/gecko/background/common/TestWaitHelper.java

rename from mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/db/TestAndroidBrowserBookmarksRepository.java
rename to mobile/android/services/src/androidTest/java/org/mozilla/gecko/background/db/TestAndroidBrowserBookmarksRepository.java

rename from mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/db/TestAndroidBrowserHistoryRepository.java
rename to mobile/android/services/src/androidTest/java/org/mozilla/gecko/background/db/TestAndroidBrowserHistoryRepository.java

rename from mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/db/TestBookmarks.java
rename to mobile/android/services/src/androidTest/java/org/mozilla/gecko/background/db/TestBookmarks.java

rename from mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/db/TestClientsDatabase.java
rename to mobile/android/services/src/androidTest/java/org/mozilla/gecko/background/db/TestClientsDatabase.java

rename from mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/db/TestClientsDatabaseAccessor.java
rename to mobile/android/services/src/androidTest/java/org/mozilla/gecko/background/db/TestClientsDatabaseAccessor.java

rename from mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/db/TestFennecTabsRepositorySession.java
rename to mobile/android/services/src/androidTest/java/org/mozilla/gecko/background/db/TestFennecTabsRepositorySession.java

rename from mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/db/TestFormHistoryRepositorySession.java
rename to mobile/android/services/src/androidTest/java/org/mozilla/gecko/background/db/TestFormHistoryRepositorySession.java

rename from mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/db/TestPasswordsRepository.java
rename to mobile/android/services/src/androidTest/java/org/mozilla/gecko/background/db/TestPasswordsRepository.java

rename from mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/db/TestTopSites.java
rename to mobile/android/services/src/androidTest/java/org/mozilla/gecko/background/db/TestTopSites.java

rename from mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/db/ThreadedRepositoryTestCase.java
rename to mobile/android/services/src/androidTest/java/org/mozilla/gecko/background/db/ThreadedRepositoryTestCase.java

rename from mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/fxa/TestAccountLoader.java
rename to mobile/android/services/src/androidTest/java/org/mozilla/gecko/background/fxa/TestAccountLoader.java

rename from mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/fxa/TestBrowserIDKeyPairGeneration.java
rename to mobile/android/services/src/androidTest/java/org/mozilla/gecko/background/fxa/TestBrowserIDKeyPairGeneration.java

rename from mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/fxa/authenticator/TestAccountPickler.java
rename to mobile/android/services/src/androidTest/java/org/mozilla/gecko/background/fxa/authenticator/TestAccountPickler.java

rename from mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/helpers/AndroidSyncTestCase.java
rename to mobile/android/services/src/androidTest/java/org/mozilla/gecko/background/helpers/AndroidSyncTestCase.java

rename from mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/helpers/DBHelpers.java
rename to mobile/android/services/src/androidTest/java/org/mozilla/gecko/background/helpers/DBHelpers.java

rename from mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/helpers/DBProviderTestCase.java
rename to mobile/android/services/src/androidTest/java/org/mozilla/gecko/background/helpers/DBProviderTestCase.java

rename from mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/nativecode/test/TestNativeCrypto.java
rename to mobile/android/services/src/androidTest/java/org/mozilla/gecko/background/nativecode/test/TestNativeCrypto.java

rename from mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/sync/AndroidSyncTestCaseWithAccounts.java
rename to mobile/android/services/src/androidTest/java/org/mozilla/gecko/background/sync/AndroidSyncTestCaseWithAccounts.java

rename from mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/sync/TestClientsStage.java
rename to mobile/android/services/src/androidTest/java/org/mozilla/gecko/background/sync/TestClientsStage.java

rename from mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/sync/TestResetting.java
rename to mobile/android/services/src/androidTest/java/org/mozilla/gecko/background/sync/TestResetting.java

rename from mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/sync/TestStoreTracking.java
rename to mobile/android/services/src/androidTest/java/org/mozilla/gecko/background/sync/TestStoreTracking.java

rename from mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/sync/TestSyncConfiguration.java
rename to mobile/android/services/src/androidTest/java/org/mozilla/gecko/background/sync/TestSyncConfiguration.java

rename from mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/sync/TestWebURLFinder.java
rename to mobile/android/services/src/androidTest/java/org/mozilla/gecko/background/sync/TestWebURLFinder.java

rename from mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/sync/helpers/BookmarkHelpers.java
rename to mobile/android/services/src/androidTest/java/org/mozilla/gecko/background/sync/helpers/BookmarkHelpers.java

rename from mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/sync/helpers/DefaultBeginDelegate.java
rename to mobile/android/services/src/androidTest/java/org/mozilla/gecko/background/sync/helpers/DefaultBeginDelegate.java

rename from mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/sync/helpers/DefaultCleanDelegate.java
rename to mobile/android/services/src/androidTest/java/org/mozilla/gecko/background/sync/helpers/DefaultCleanDelegate.java

rename from mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/sync/helpers/DefaultDelegate.java
rename to mobile/android/services/src/androidTest/java/org/mozilla/gecko/background/sync/helpers/DefaultDelegate.java

rename from mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/sync/helpers/DefaultFetchDelegate.java
rename to mobile/android/services/src/androidTest/java/org/mozilla/gecko/background/sync/helpers/DefaultFetchDelegate.java

rename from mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/sync/helpers/DefaultFinishDelegate.java
rename to mobile/android/services/src/androidTest/java/org/mozilla/gecko/background/sync/helpers/DefaultFinishDelegate.java

rename from mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/sync/helpers/DefaultSessionCreationDelegate.java
rename to mobile/android/services/src/androidTest/java/org/mozilla/gecko/background/sync/helpers/DefaultSessionCreationDelegate.java

rename from mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/sync/helpers/DefaultStoreDelegate.java
rename to mobile/android/services/src/androidTest/java/org/mozilla/gecko/background/sync/helpers/DefaultStoreDelegate.java

rename from mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/sync/helpers/ExpectBeginDelegate.java
rename to mobile/android/services/src/androidTest/java/org/mozilla/gecko/background/sync/helpers/ExpectBeginDelegate.java

rename from mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/sync/helpers/ExpectBeginFailDelegate.java
rename to mobile/android/services/src/androidTest/java/org/mozilla/gecko/background/sync/helpers/ExpectBeginFailDelegate.java

rename from mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/sync/helpers/ExpectFetchDelegate.java
rename to mobile/android/services/src/androidTest/java/org/mozilla/gecko/background/sync/helpers/ExpectFetchDelegate.java

rename from mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/sync/helpers/ExpectFetchSinceDelegate.java
rename to mobile/android/services/src/androidTest/java/org/mozilla/gecko/background/sync/helpers/ExpectFetchSinceDelegate.java

rename from mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/sync/helpers/ExpectFinishDelegate.java
rename to mobile/android/services/src/androidTest/java/org/mozilla/gecko/background/sync/helpers/ExpectFinishDelegate.java

rename from mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/sync/helpers/ExpectFinishFailDelegate.java
rename to mobile/android/services/src/androidTest/java/org/mozilla/gecko/background/sync/helpers/ExpectFinishFailDelegate.java

rename from mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/sync/helpers/ExpectInvalidRequestFetchDelegate.java
rename to mobile/android/services/src/androidTest/java/org/mozilla/gecko/background/sync/helpers/ExpectInvalidRequestFetchDelegate.java

rename from mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/sync/helpers/ExpectInvalidTypeStoreDelegate.java
rename to mobile/android/services/src/androidTest/java/org/mozilla/gecko/background/sync/helpers/ExpectInvalidTypeStoreDelegate.java

rename from mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/sync/helpers/ExpectManyStoredDelegate.java
rename to mobile/android/services/src/androidTest/java/org/mozilla/gecko/background/sync/helpers/ExpectManyStoredDelegate.java

rename from mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/sync/helpers/ExpectNoStoreDelegate.java
rename to mobile/android/services/src/androidTest/java/org/mozilla/gecko/background/sync/helpers/ExpectNoStoreDelegate.java

rename from mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/sync/helpers/ExpectStoreCompletedDelegate.java
rename to mobile/android/services/src/androidTest/java/org/mozilla/gecko/background/sync/helpers/ExpectStoreCompletedDelegate.java

rename from mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/sync/helpers/ExpectStoredDelegate.java
rename to mobile/android/services/src/androidTest/java/org/mozilla/gecko/background/sync/helpers/ExpectStoredDelegate.java

rename from mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/sync/helpers/HistoryHelpers.java
rename to mobile/android/services/src/androidTest/java/org/mozilla/gecko/background/sync/helpers/HistoryHelpers.java

rename from mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/sync/helpers/PasswordHelpers.java
rename to mobile/android/services/src/androidTest/java/org/mozilla/gecko/background/sync/helpers/PasswordHelpers.java

rename from mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/sync/helpers/SessionTestHelper.java
rename to mobile/android/services/src/androidTest/java/org/mozilla/gecko/background/sync/helpers/SessionTestHelper.java

rename from mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/sync/helpers/SimpleSuccessBeginDelegate.java
rename to mobile/android/services/src/androidTest/java/org/mozilla/gecko/background/sync/helpers/SimpleSuccessBeginDelegate.java

rename from mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/sync/helpers/SimpleSuccessCreationDelegate.java
rename to mobile/android/services/src/androidTest/java/org/mozilla/gecko/background/sync/helpers/SimpleSuccessCreationDelegate.java

rename from mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/sync/helpers/SimpleSuccessFetchDelegate.java
rename to mobile/android/services/src/androidTest/java/org/mozilla/gecko/background/sync/helpers/SimpleSuccessFetchDelegate.java

rename from mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/sync/helpers/SimpleSuccessFinishDelegate.java
rename to mobile/android/services/src/androidTest/java/org/mozilla/gecko/background/sync/helpers/SimpleSuccessFinishDelegate.java

rename from mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/sync/helpers/SimpleSuccessStoreDelegate.java
rename to mobile/android/services/src/androidTest/java/org/mozilla/gecko/background/sync/helpers/SimpleSuccessStoreDelegate.java

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

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

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

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

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

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

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

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

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

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

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

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

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