diff --git a/lib/d/Makefile.am b/lib/d/Makefile.am
index 04c0639..759677a 100644
--- a/lib/d/Makefile.am
+++ b/lib/d/Makefile.am
@@ -17,7 +17,13 @@
 # under the License.
 #
 
-SUBDIRS = . test
+AUTOMAKE_OPTIONS = serial-tests
+
+SUBDIRS = .
+
+if WITH_TESTS
+SUBDIRS += test
+endif
 
 #
 # Enumeration of all the public and private modules.
diff --git a/lib/d/test/Makefile.am b/lib/d/test/Makefile.am
index 44f2d66..0482583 100755
--- a/lib/d/test/Makefile.am
+++ b/lib/d/test/Makefile.am
@@ -17,6 +17,7 @@
 # under the License.
 #
 
+AUTOMAKE_OPTIONS = serial-tests
 
 # Thrift compiler rules