diff --git a/build.xml b/build.xml
index 49e5b40..c5483f0 100755
--- a/build.xml
+++ b/build.xml
@@ -79,15 +79,6 @@
 			<classpath refid="apache-classpath"/>
 		</javac>
 
-		<!-- Compile the GPU unit tests -->
-    <exec executable="make" dir="${src}/infodynamics/measures/continuous/kraskov/cuda/">
-      <arg value="test"/>
-    </exec>
-    <move todir="${unittestsbin}/infodynamics/measures/continuous/kraskov/cuda"
-      file="${src}/infodynamics/measures/continuous/kraskov/cuda/unittest"/>
-    <copy todir="${unittestsbin}/infodynamics/measures/continuous/kraskov/cuda"
-      file="${bin}/infodynamics/measures/continuous/kraskov/cuda/libKraskov.so"/>
-
 		<!-- Run the junit tests and make sure they complete ok -->
 		<junit printsummary="yes" showoutput="yes" fork="true" forkmode="once" haltonfailure="yes" haltonerror="yes" includeantruntime="true">
 			<classpath>
@@ -105,7 +96,10 @@
 				</fileset>
 			</batchtest>
 		</junit>
-    <exec executable="./unittest" dir="${unittestsbin}/infodynamics/measures/continuous/kraskov/cuda/"/>
+
+    <!-- If applicable, run also GPU tests -->
+    <antcall target="gputest" if:true="${enablegpu}"/>
+
 	</target>
 
 	<!-- Make javadocs, excluding the classes we've derived from Apache Commons Math -->
@@ -204,6 +198,22 @@
     </exec>
   </target>
 
+  <!-- Test GPU code -->
+  <target name="gputest" description="compile and run C unit tests for GPU code">
+
+		<!-- Compile the GPU unit tests -->
+    <exec executable="make" dir="${src}/infodynamics/measures/continuous/kraskov/cuda/">
+      <arg value="test"/>
+    </exec>
+    <move todir="${unittestsbin}/infodynamics/measures/continuous/kraskov/cuda"
+      file="${src}/infodynamics/measures/continuous/kraskov/cuda/unittest"/>
+    <copy todir="${unittestsbin}/infodynamics/measures/continuous/kraskov/cuda"
+      file="${bin}/infodynamics/measures/continuous/kraskov/cuda/libKraskov.so"/>
+
+    <exec executable="./unittest" dir="${unittestsbin}/infodynamics/measures/continuous/kraskov/cuda/"/>
+
+  </target>
+
 	<!-- Developer build - creates readme and version files -->
 	<target name="readmefiles" description="developer: create the readme and version files from templates">
 		<tstamp>