-noinst_JAVA = Master.java Slave.java CommTimeTest.java CommTimeTask.java
-TESTS = CommTimeTest.class
+JAVA_SRC = Master.java Slave.java CommTimeTest.java CommTimeTask.java
+JAVA_TESTS = CommTimeTest.class
+
+# Declare test class
+@HAVE_JAVA_TRUE@noinst_JAVA = $(JAVA_SRC)
+@HAVE_JAVA_TRUE@TESTS = $(JAVA_TESTS)