--- a/config/Makefile.in
+++ b/config/Makefile.in
@@ -82,22 +82,18 @@ endif
 GARBAGE += \
   $(FINAL_LINK_COMPS) $(FINAL_LINK_LIBS) $(FINAL_LINK_COMP_NAMES) $(srcdir)/*.pyc *.pyc
 
 FORCE:
 
 ifndef JS_STANDALONE
 check-preqs += check-jar-mn
 endif
-check-preqs += check-makefiles
 
 check:: $(check-preqs)
 
 check-jar-mn::
 	$(MAKE) -C tests/src-simple check-jar
 	$(MAKE) -C tests/src-simple check-flat
 	$(MAKE) -C tests/src-simple check-flat USE_EXTENSION_MANIFEST=1
 ifneq (,$(filter-out WINNT,$(OS_ARCH)))
 	$(MAKE) -C tests/src-simple check-symlink
 endif
-
-check-makefiles:
-	$(MAKE) -C tests/makefiles/autodeps check

--- a/config/moz.build
+++ b/config/moz.build
@@ -10,17 +10,16 @@ with Files('**'):
 DIST_INSTALL = False
 # For sanity's sake, we compile nsinstall without the wrapped system
 # headers, so that we can use it to set up the wrapped system headers.
 NO_VISIBILITY_FLAGS = True
 
 CONFIGURE_SUBST_FILES += [
     'doxygen.cfg',
     'makefiles/test/Makefile',
-    'tests/makefiles/autodeps/Makefile',
     'tests/src-simple/Makefile',
 ]
 
 if CONFIG['HOST_OS_ARCH'] != 'WINNT':
     HOST_SOURCES += [
         'nsinstall.c',
         'pathsub.c',
     ]

deleted file mode 100644
--- a/config/tests/makefiles/autodeps/Makefile.in
+++ /dev/null
@@ -1,36 +0,0 @@
-# -*- makefile -*-
-#
-# 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/.
-#
-
-export STANDALONE_MAKEFILE=1
-PYTHON ?= python
-PYTEST = $(PYTHON) -E
-
-# python -B not supported by older interpreters
-export PYTHONDONTWRITEBYTECODE=1
-
-include $(topsrcdir)/config/rules.mk
-
-autotgt_tests = .deps/autotargets.mk.ts
-
-tgts =\
-  .deps/.mkdir.done\
-  $(autotgt_tests)
-  $(NULL)
-
-export MAKE
-
-##------------------_##
-##---]  TARGETS  [---##
-##------------------_##
-all::
-
-check:: $(tgts)
-
-# Only run unit test when autotargets.mk is modified
-$(autotgt_tests): $(topsrcdir)/config/makefiles/autotargets.mk
-	$(PYTEST) $(srcdir)/check_mkdir.tpy
-	@$(TOUCH) $@

rename from config/tests/makefiles/autodeps/check_mkdir.tpy
rename to config/tests/makefiles/autodeps/check_mkdir.py
--- a/config/tests/makefiles/autodeps/check_mkdir.tpy
+++ b/config/tests/makefiles/autodeps/check_mkdir.py
@@ -42,17 +42,17 @@ def myopts(vals):
 
         for k in dir(vals):
             if k[0:1] == '_':
                 continue
             tmp[k] = getattr(vals, k)
         myopts.vals = tmp
 
     return myopts.vals
-    
+
 
 def path2posix(src):
     """
     Normalize directory path syntax
 
     Keyword arguments:
     src - path to normalize
 
@@ -73,17 +73,17 @@ def path2posix(src):
     if drive:
         todo = [ '', drive.rstrip(':').lstrip('/').lstrip('\\') ]
         todo.extend( tail.lstrip('/').lstrip('\\').split('\\') ) # c:\a => [a]
     else: # os.name == 'posix'
         todo = src.split('\\')
 
     dst = '/'.join(todo)
     return dst
-    
+
 
 def checkMkdir(work, debug=False):
     """
     Verify arg permutations for directory mutex creation.
 
     Keyword arguments:
     None
 
@@ -161,17 +161,17 @@ def checkMkdir(work, debug=False):
         logging.debug("Did testing mkdir(%s) succeed?" % (path))
         if not os.path.exists(path):
             raise Exception("Test path %s does not exist" % (path))
 
 
 def parseargs():
     """
     Support additional command line arguments for testing
-    
+
     Returns:
     hash - arguments of interested parsed from the command line
     """
 
     opts = None
     try:
         import argparse2
         parser = argparse.ArgumentParser()

deleted file mode 100644
--- a/config/tests/makefiles/autodeps/moz.build
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- Mode: python; 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/.
-

--- a/config/tests/python.ini
+++ b/config/tests/python.ini
@@ -1,5 +1,6 @@
 [test_mozbuild_reading.py]
 [unit-expandlibs.py]
 [unit-mozunit.py]
 [unit-nsinstall.py]
 [unit-printprereleasesuffix.py]
+[makefiles/autodeps/check_mkdir.py]