--- a/mobile/android/tests/background/junit3/background_junit3_sources.mozbuild
+++ b/mobile/android/tests/background/junit3/background_junit3_sources.mozbuild
@@ -1,17 +1,16 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 background_junit3_sources = [
     'src/org/mozilla/gecko/background/common/TestAndroidLogWriters.java',
-    'src/org/mozilla/gecko/background/common/TestBrowserContractHelpers.java',
     'src/org/mozilla/gecko/background/common/TestUtils.java',
     'src/org/mozilla/gecko/background/common/TestWaitHelper.java',
     'src/org/mozilla/gecko/background/db/AndroidBrowserRepositoryTestCase.java',
     'src/org/mozilla/gecko/background/db/TestAndroidBrowserBookmarksRepository.java',
     'src/org/mozilla/gecko/background/db/TestAndroidBrowserHistoryRepository.java',
     'src/org/mozilla/gecko/background/db/TestBookmarks.java',
     'src/org/mozilla/gecko/background/db/TestClientsDatabase.java',
     'src/org/mozilla/gecko/background/db/TestClientsDatabaseAccessor.java',

--- a/mobile/android/tests/background/junit3/instrumentation.ini
+++ b/mobile/android/tests/background/junit3/instrumentation.ini
@@ -1,13 +1,12 @@
 [DEFAULT]
 subsuite = background
 
 [src/org/mozilla/gecko/background/common/TestAndroidLogWriters.java]
-[src/org/mozilla/gecko/background/common/TestBrowserContractHelpers.java]
 [src/org/mozilla/gecko/background/common/TestUtils.java]
 [src/org/mozilla/gecko/background/common/TestWaitHelper.java]
 [src/org/mozilla/gecko/background/db/TestAndroidBrowserBookmarksRepository.java]
 [src/org/mozilla/gecko/background/db/TestAndroidBrowserHistoryRepository.java]
 [src/org/mozilla/gecko/background/db/TestBookmarks.java]
 [src/org/mozilla/gecko/background/db/TestClientsDatabase.java]
 [src/org/mozilla/gecko/background/db/TestClientsDatabaseAccessor.java]
 [src/org/mozilla/gecko/background/db/TestFennecTabsRepositorySession.java]

deleted file mode 100644
--- a/mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/common/TestBrowserContractHelpers.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-package org.mozilla.gecko.background.common;
-
-import org.mozilla.gecko.background.helpers.AndroidSyncTestCase;
-import org.mozilla.gecko.sync.repositories.android.BrowserContractHelpers;
-
-public class TestBrowserContractHelpers extends AndroidSyncTestCase {
-  public void testBookmarkCodes() {
-    final String[] strings = {
-      // Observe omissions: "microsummary", "item".
-      "folder", "bookmark", "separator", "livemark", "query"
-    };
-    for (int i = 0; i < strings.length; ++i) {
-      assertEquals(strings[i], BrowserContractHelpers.typeStringForCode(i));
-      assertEquals(i, BrowserContractHelpers.typeCodeForString(strings[i]));
-    }
-    assertEquals(null, BrowserContractHelpers.typeStringForCode(-1));
-    assertEquals(null, BrowserContractHelpers.typeStringForCode(100));
-
-    assertEquals(-1, BrowserContractHelpers.typeCodeForString(null));
-    assertEquals(-1, BrowserContractHelpers.typeCodeForString("folder "));
-    assertEquals(-1, BrowserContractHelpers.typeCodeForString("FOLDER"));
-    assertEquals(-1, BrowserContractHelpers.typeCodeForString(""));
-    assertEquals(-1, BrowserContractHelpers.typeCodeForString("nope"));
-  }
-}

new file mode 100644
--- /dev/null
+++ b/mobile/android/tests/background/junit4/src/org/mozilla/gecko/sync/repositories/android/BrowserContractHelpersTest.java
@@ -0,0 +1,33 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+package org.mozilla.gecko.sync.repositories.android;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mozilla.gecko.background.testhelpers.TestRunner;
+
+import static org.junit.Assert.*;
+
+@RunWith(TestRunner.class)
+public class BrowserContractHelpersTest {
+    @Test
+    public void testBookmarkCodes() {
+        final String[] strings = {
+                // Observe omissions: "microsummary", "item".
+                "folder", "bookmark", "separator", "livemark", "query"
+        };
+        for (int i = 0; i < strings.length; ++i) {
+            assertEquals(strings[i], BrowserContractHelpers.typeStringForCode(i));
+            assertEquals(i, BrowserContractHelpers.typeCodeForString(strings[i]));
+        }
+        assertEquals(null, BrowserContractHelpers.typeStringForCode(-1));
+        assertEquals(null, BrowserContractHelpers.typeStringForCode(100));
+
+        assertEquals(-1, BrowserContractHelpers.typeCodeForString(null));
+        assertEquals(-1, BrowserContractHelpers.typeCodeForString("folder "));
+        assertEquals(-1, BrowserContractHelpers.typeCodeForString("FOLDER"));
+        assertEquals(-1, BrowserContractHelpers.typeCodeForString(""));
+        assertEquals(-1, BrowserContractHelpers.typeCodeForString("nope"));
+    }
+}
\ No newline at end of file