diff --git a/Makefile.am b/Makefile.am
index 89d04c35b8e0e5450039c970f307abb9a32ec7a3..ed9320be92f701b5a2cb1972d5b86d661e99788d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
 # standard automake rules
-SUBDIRS = man lib scripts daemons doc testing tools qa
+SUBDIRS = man lib scripts daemons doc test tools qa
 
 # custom rules
 depgraph: depgraph.png
diff --git a/configure.ac b/configure.ac
index ad56fda46c093a32f938a25fce7113442ff0c787..64fa9a1b1421cf3995be2fac1a7370c171551957 100644
--- a/configure.ac
+++ b/configure.ac
@@ -28,7 +28,7 @@ AC_CONFIG_FILES([
   man/Makefile
   qa/Makefile
   scripts/Makefile
-  testing/Makefile
+  test/Makefile
   tools/Makefile
 ])