--- a/testing/mozbase/moztest/tests/test.py
+++ b/testing/mozbase/moztest/tests/test.py
@@ -36,25 +36,24 @@ class Result(unittest.TestCase):
 
 
 class Collection(unittest.TestCase):
 
     def setUp(self):
         c1 = TestContext('host1')
         c2 = TestContext('host2')
         c3 = TestContext('host2')
-        c3.os = 'B2G'
         c4 = TestContext('host1')
 
         t1 = TestResult('t1', context=c1)
         t2 = TestResult('t2', context=c2)
         t3 = TestResult('t3', context=c3)
         t4 = TestResult('t4', context=c4)
 
         self.collection = TestResultCollection('tests')
         self.collection.extend([t1, t2, t3, t4])
 
     def test_unique_contexts(self):
-        self.assertEqual(len(self.collection.contexts), 3)
+        self.assertEqual(len(self.collection.contexts), 2)
 
 
 if __name__ == '__main__':
     mozunit.main()

--- a/testing/mozbase/mozversion/tests/manifest.ini
+++ b/testing/mozbase/mozversion/tests/manifest.ini
@@ -1,6 +1,5 @@
 [DEFAULT]
 subsuite = mozbase, os == "linux"
 [test_binary.py]
 [test_sources.py]
-[test_b2g.py]
 [test_apk.py]

--- a/testing/mozbase/packages.txt
+++ b/testing/mozbase/packages.txt
@@ -1,10 +1,9 @@
 manifestparser.pth:testing/mozbase/manifestparser
-mozb2g.pth:testing/mozbase/mozb2g
 mozcrash.pth:testing/mozbase/mozcrash
 mozdebug.pth:testing/mozbase/mozdebug
 mozdevice.pth:testing/mozbase/mozdevice
 mozfile.pth:testing/mozbase/mozfile
 mozhttpd.pth:testing/mozbase/mozhttpd
 mozinfo.pth:testing/mozbase/mozinfo
 mozinstall.pth:testing/mozbase/mozinstall
 mozleak.pth:testing/mozbase/mozleak