diff --git a/test/Makefile.am b/test/Makefile.am
index fb39a12..1a1bf47 100755
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -53,8 +53,10 @@
 if WITH_PYTHON
 SUBDIRS += py
 PRECROSS_TARGET += precross-py
-SUBDIRS += py.twisted
 SUBDIRS += py.tornado
+if WITH_TWISTED_TEST
+SUBDIRS += py.twisted
+endif
 endif
 
 if WITH_RUBY
diff --git a/test/py.twisted/Makefile.am b/test/py.twisted/Makefile.am
index 5020215..78cde22 100644
--- a/test/py.twisted/Makefile.am
+++ b/test/py.twisted/Makefile.am
@@ -18,6 +18,7 @@
 #
 
 THRIFT = $(top_builddir)/compiler/cpp/thrift
+TRIAL ?= trial
 
 stubs: ../ThriftTest.thrift ../SmallTest.thrift
 	$(THRIFT) --gen py:twisted ../ThriftTest.thrift