diff --git a/accessible/moz.build b/accessible/moz.build
index 060aa27edc92..44f345780018 100644
--- a/accessible/moz.build
+++ b/accessible/moz.build
@@ -20,4 +20,4 @@ DIRS += ['base', 'generic', 'html', 'interfaces', 'jsat', 'xpcom']
 if CONFIG['MOZ_XUL']:
     DIRS += ['xul']
 
-TEST_DIRS += ['tests']
+TEST_DIRS += ['tests/mochitest']
diff --git a/accessible/tests/mochitest/actions/moz.build b/accessible/tests/mochitest/actions/moz.build
deleted file mode 100644
index 4092a7268915..000000000000
--- a/accessible/tests/mochitest/actions/moz.build
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- 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/.
-
-A11Y_MANIFESTS += ['a11y.ini']
-
diff --git a/accessible/tests/mochitest/attributes/moz.build b/accessible/tests/mochitest/attributes/moz.build
deleted file mode 100644
index 4092a7268915..000000000000
--- a/accessible/tests/mochitest/attributes/moz.build
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- 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/.
-
-A11Y_MANIFESTS += ['a11y.ini']
-
diff --git a/accessible/tests/mochitest/bounds/moz.build b/accessible/tests/mochitest/bounds/moz.build
deleted file mode 100644
index 4092a7268915..000000000000
--- a/accessible/tests/mochitest/bounds/moz.build
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- 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/.
-
-A11Y_MANIFESTS += ['a11y.ini']
-
diff --git a/accessible/tests/mochitest/editabletext/moz.build b/accessible/tests/mochitest/editabletext/moz.build
deleted file mode 100644
index 4092a7268915..000000000000
--- a/accessible/tests/mochitest/editabletext/moz.build
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- 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/.
-
-A11Y_MANIFESTS += ['a11y.ini']
-
diff --git a/accessible/tests/mochitest/elm/moz.build b/accessible/tests/mochitest/elm/moz.build
deleted file mode 100644
index 4092a7268915..000000000000
--- a/accessible/tests/mochitest/elm/moz.build
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- 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/.
-
-A11Y_MANIFESTS += ['a11y.ini']
-
diff --git a/accessible/tests/mochitest/focus/moz.build b/accessible/tests/mochitest/focus/moz.build
deleted file mode 100644
index 4092a7268915..000000000000
--- a/accessible/tests/mochitest/focus/moz.build
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- 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/.
-
-A11Y_MANIFESTS += ['a11y.ini']
-
diff --git a/accessible/tests/mochitest/hittest/moz.build b/accessible/tests/mochitest/hittest/moz.build
deleted file mode 100644
index 4092a7268915..000000000000
--- a/accessible/tests/mochitest/hittest/moz.build
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- 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/.
-
-A11Y_MANIFESTS += ['a11y.ini']
-
diff --git a/accessible/tests/mochitest/hyperlink/moz.build b/accessible/tests/mochitest/hyperlink/moz.build
deleted file mode 100644
index 4092a7268915..000000000000
--- a/accessible/tests/mochitest/hyperlink/moz.build
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- 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/.
-
-A11Y_MANIFESTS += ['a11y.ini']
-
diff --git a/accessible/tests/mochitest/hypertext/moz.build b/accessible/tests/mochitest/hypertext/moz.build
deleted file mode 100644
index 4092a7268915..000000000000
--- a/accessible/tests/mochitest/hypertext/moz.build
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- 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/.
-
-A11Y_MANIFESTS += ['a11y.ini']
-
diff --git a/accessible/tests/mochitest/jsat/moz.build b/accessible/tests/mochitest/jsat/moz.build
deleted file mode 100644
index 88f548112f23..000000000000
--- a/accessible/tests/mochitest/jsat/moz.build
+++ /dev/null
@@ -1,7 +0,0 @@
-# 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/.
-
-A11Y_MANIFESTS += ['a11y.ini']
-
diff --git a/accessible/tests/mochitest/moz.build b/accessible/tests/mochitest/moz.build
index 9cb520e7238b..babc60ed16d4 100644
--- a/accessible/tests/mochitest/moz.build
+++ b/accessible/tests/mochitest/moz.build
@@ -4,36 +4,33 @@
 # 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/.
 
-DIRS += [
-    'actions',
-    'attributes',
-    'bounds',
-    'editabletext',
-    'elm',
-    'focus',
-    'hittest',
-    'hyperlink',
-    'hypertext',
-    'jsat',
-    'name',
-    'pivot',
-    'relations',
-    'role',
-    'scroll',
-    'selectable',
-    'states',
-    'table',
-    'text',
-    'textattrs',
-    'textcaret',
-    'textselection',
-    'treeupdate',
-    'value',
-]
-
 A11Y_MANIFESTS += [
     'a11y.ini',
+    'actions/a11y.ini',
+    'attributes/a11y.ini',
+    'bounds/a11y.ini',
+    'editabletext/a11y.ini',
+    'elm/a11y.ini',
     'events/a11y.ini',
+    'focus/a11y.ini',
+    'hittest/a11y.ini',
+    'hyperlink/a11y.ini',
+    'hypertext/a11y.ini',
+    'jsat/a11y.ini',
+    'name/a11y.ini',
+    'pivot/a11y.ini',
+    'relations/a11y.ini',
+    'role/a11y.ini',
+    'scroll/a11y.ini',
+    'selectable/a11y.ini',
+    'states/a11y.ini',
+    'table/a11y.ini',
+    'text/a11y.ini',
+    'textattrs/a11y.ini',
+    'textcaret/a11y.ini',
     'textrange/a11y.ini',
+    'textselection/a11y.ini',
     'tree/a11y.ini',
+    'treeupdate/a11y.ini',
+    'value/a11y.ini',
 ]
diff --git a/accessible/tests/mochitest/name/moz.build b/accessible/tests/mochitest/name/moz.build
deleted file mode 100644
index 4092a7268915..000000000000
--- a/accessible/tests/mochitest/name/moz.build
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- 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/.
-
-A11Y_MANIFESTS += ['a11y.ini']
-
diff --git a/accessible/tests/mochitest/pivot/moz.build b/accessible/tests/mochitest/pivot/moz.build
deleted file mode 100644
index 4092a7268915..000000000000
--- a/accessible/tests/mochitest/pivot/moz.build
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- 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/.
-
-A11Y_MANIFESTS += ['a11y.ini']
-
diff --git a/accessible/tests/mochitest/relations/moz.build b/accessible/tests/mochitest/relations/moz.build
deleted file mode 100644
index 4092a7268915..000000000000
--- a/accessible/tests/mochitest/relations/moz.build
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- 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/.
-
-A11Y_MANIFESTS += ['a11y.ini']
-
diff --git a/accessible/tests/mochitest/role/moz.build b/accessible/tests/mochitest/role/moz.build
deleted file mode 100644
index 4092a7268915..000000000000
--- a/accessible/tests/mochitest/role/moz.build
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- 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/.
-
-A11Y_MANIFESTS += ['a11y.ini']
-
diff --git a/accessible/tests/mochitest/scroll/moz.build b/accessible/tests/mochitest/scroll/moz.build
deleted file mode 100644
index 4092a7268915..000000000000
--- a/accessible/tests/mochitest/scroll/moz.build
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- 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/.
-
-A11Y_MANIFESTS += ['a11y.ini']
-
diff --git a/accessible/tests/mochitest/selectable/moz.build b/accessible/tests/mochitest/selectable/moz.build
deleted file mode 100644
index 4092a7268915..000000000000
--- a/accessible/tests/mochitest/selectable/moz.build
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- 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/.
-
-A11Y_MANIFESTS += ['a11y.ini']
-
diff --git a/accessible/tests/mochitest/states/moz.build b/accessible/tests/mochitest/states/moz.build
deleted file mode 100644
index 4092a7268915..000000000000
--- a/accessible/tests/mochitest/states/moz.build
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- 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/.
-
-A11Y_MANIFESTS += ['a11y.ini']
-
diff --git a/accessible/tests/mochitest/table/moz.build b/accessible/tests/mochitest/table/moz.build
deleted file mode 100644
index 4092a7268915..000000000000
--- a/accessible/tests/mochitest/table/moz.build
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- 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/.
-
-A11Y_MANIFESTS += ['a11y.ini']
-
diff --git a/accessible/tests/mochitest/text/moz.build b/accessible/tests/mochitest/text/moz.build
deleted file mode 100644
index 4092a7268915..000000000000
--- a/accessible/tests/mochitest/text/moz.build
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- 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/.
-
-A11Y_MANIFESTS += ['a11y.ini']
-
diff --git a/accessible/tests/mochitest/textattrs/moz.build b/accessible/tests/mochitest/textattrs/moz.build
deleted file mode 100644
index 4092a7268915..000000000000
--- a/accessible/tests/mochitest/textattrs/moz.build
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- 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/.
-
-A11Y_MANIFESTS += ['a11y.ini']
-
diff --git a/accessible/tests/mochitest/textcaret/moz.build b/accessible/tests/mochitest/textcaret/moz.build
deleted file mode 100644
index 4092a7268915..000000000000
--- a/accessible/tests/mochitest/textcaret/moz.build
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- 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/.
-
-A11Y_MANIFESTS += ['a11y.ini']
-
diff --git a/accessible/tests/mochitest/textselection/moz.build b/accessible/tests/mochitest/textselection/moz.build
deleted file mode 100644
index 4092a7268915..000000000000
--- a/accessible/tests/mochitest/textselection/moz.build
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- 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/.
-
-A11Y_MANIFESTS += ['a11y.ini']
-
diff --git a/accessible/tests/mochitest/treeupdate/moz.build b/accessible/tests/mochitest/treeupdate/moz.build
deleted file mode 100644
index 4092a7268915..000000000000
--- a/accessible/tests/mochitest/treeupdate/moz.build
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- 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/.
-
-A11Y_MANIFESTS += ['a11y.ini']
-
diff --git a/accessible/tests/mochitest/value/moz.build b/accessible/tests/mochitest/value/moz.build
deleted file mode 100644
index 4092a7268915..000000000000
--- a/accessible/tests/mochitest/value/moz.build
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- 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/.
-
-A11Y_MANIFESTS += ['a11y.ini']
-
diff --git a/accessible/tests/moz.build b/accessible/tests/moz.build
deleted file mode 100644
index a6669fdeae50..000000000000
--- a/accessible/tests/moz.build
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- 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/.
-
-DIRS += ['mochitest']
-