diff --git a/test/c_glib/Makefile.am b/test/c_glib/Makefile.am
index de23cb9..252edb9 100755
--- a/test/c_glib/Makefile.am
+++ b/test/c_glib/Makefile.am
@@ -16,7 +16,8 @@
 # specific language governing permissions and limitations
 # under the License.
 #
-.NOTPARALLEL:
+AUTOMAKE_OPTIONS = subdir-objects serial-tests
+
 noinst_LTLIBRARIES = libtestcglib.la
 nodist_libtestcglib_la_SOURCES = \
 	gen-c_glib/t_test_second_service.c \
diff --git a/test/cpp/Makefile.am b/test/cpp/Makefile.am
index 3cf31a3..51380ab 100755
--- a/test/cpp/Makefile.am
+++ b/test/cpp/Makefile.am
@@ -16,7 +16,8 @@
 # specific language governing permissions and limitations
 # under the License.
 #
-.NOTPARALLEL:
+AUTOMAKE_OPTIONS = subdir-objects serial-tests
+
 noinst_LTLIBRARIES = libtestgencpp.la libstresstestgencpp.la
 nodist_libtestgencpp_la_SOURCES = \
 	gen-cpp/ThriftTest_constants.cpp \
diff --git a/test/py/Makefile.am b/test/py/Makefile.am
index 6b31769..2fe9b5a 100755
--- a/test/py/Makefile.am
+++ b/test/py/Makefile.am
@@ -16,7 +16,8 @@
 # specific language governing permissions and limitations
 # under the License.
 #
-.NOTPARALLEL:
+AUTOMAKE_OPTIONS = serial-tests
+
 THRIFT = $(top_srcdir)/compiler/cpp/thrift
 
 py_unit_tests = RunClientServer.py