diff --git a/configure.ac b/configure.ac
index d8a7b00..96329ce 100644
--- a/configure.ac
+++ b/configure.ac
@@ -129,6 +129,7 @@
   if/Makefile
   test/Makefile
   test/py/Makefile
+  test/java/Makefile
 ])
 
 AC_OUTPUT
diff --git a/test/Makefile.am b/test/Makefile.am
index 07c2e77..db31738 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,5 +1,9 @@
 SUBDIRS = py
 
+if ENABLE_JAVA
+SUBDIRS += java
+endif
+
 check_PROGRAMS = \
 	DebugProtoTest \
 	JSONProtoTest \
diff --git a/test/java/Makefile.am b/test/java/Makefile.am
new file mode 100644
index 0000000..8cb19ae
--- /dev/null
+++ b/test/java/Makefile.am
@@ -0,0 +1,6 @@
+check:
+	$(ANT) test
+
+clean-generic:
+	$(ANT) clean
+