diff --git a/test/codegen/.project b/test/codegen/.project
index 971890c3e985b8cc84cf1fe140d409d308614f54..f89ab7166953bb78209e3ca0b8647a17f778e5b0 100644
--- a/test/codegen/.project
+++ b/test/codegen/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>codegen</name>
+	<name>test-codegen</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/test/runtime/.classpath b/test/runtime/.classpath
new file mode 100644
index 0000000000000000000000000000000000000000..5894940377c80fc9760edeb0b6df219cde20e261
--- /dev/null
+++ b/test/runtime/.classpath
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src/java"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/com.amd.aparapi"/>
+	<classpathentry kind="output" path="classes"/>
+</classpath>
diff --git a/test/runtime/.project b/test/runtime/.project
new file mode 100644
index 0000000000000000000000000000000000000000..0b3d5824a64aab382ef7a19bde6c1f13c13de22c
--- /dev/null
+++ b/test/runtime/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>test-runtime</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/test/runtime/build.xml b/test/runtime/build.xml
new file mode 100644
index 0000000000000000000000000000000000000000..7af1dcebeb736a71b18128d972d55277d88a2fb4
--- /dev/null
+++ b/test/runtime/build.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0"?>
+
+<project name="codegen" default="junit" basedir=".">
+
+   <!-- 
+			USER CONFIGURABLE PROPERTIES 
+   -->	
+   <property name="junit.jar.version" value="4.10"/>
+   <property name="junit.jar.name" value="junit-${junit.jar.version}.jar"/>
+   <property name="junit.home" value="${basedir}/.libs"/>
+   <property name="junit.base.url" value="http://repo1.maven.org/maven2/junit/junit"/>
+	
+   <!-- 
+			DO NOT EDIT BELOW THIS LINE 
+   -->
+   <echo>OS Name:    ${os.name}</echo>
+   <echo>OS Version: ${os.version}</echo>
+   <echo>OS Arch:    ${os.arch}</echo>
+
+   <property name="build.compiler" value="javac1.6"/>
+   <property name="ant.build.javac.source" value="1.6"/>
+   <property name="ant.build.javac.target" value="1.6"/>
+	
+   <available property="junit.installed" file="${junit.home}/${junit.jar.name}"/>
+
+	<target name="install.junit" unless="junit.installed">
+	   <mkdir dir="${junit.home}"/>
+	   <!-- Cleanup all existing JUnit installations -->
+	   <delete failonerror="false" includeEmptyDirs="true">
+		   <fileset dir="${junit.home}" includes="junit*/"/>
+	   </delete>
+	   <!-- Download and unzip requested JUnit version -->
+	   <get src="${junit.base.url}/${junit.jar.version}/${junit.jar.name}" dest="${junit.home}"/>
+	</target>
+	
+   <target name="clean">
+      <delete dir="classes"/>
+      <delete dir="junit"/>
+      <delete dir="src/genjava/com"/>
+   	  <!-- Legacy cleanup -->
+      <delete file="junit*.jar"/>
+   </target>
+
+   <path id="classpath">
+      <pathelement path="${basedir}/../../com.amd.aparapi/dist/aparapi.jar"/>
+      <pathelement path="${junit.home}/${junit.jar.name}"/>
+      <pathelement path="classes"/>
+   </path>
+	
+   <target name="junit" depends="clean, install.junit">
+      <mkdir dir="classes"/>
+   	  <javac debug="true"
+      	 debuglevel="lines,vars,source"
+         srcdir="src/java" 
+      	 destdir="classes" 
+      	 includeAntRuntime="false"
+      	 classpathref="classpath">
+      	    <compilerarg value="-Xlint"/>
+      	   	<compilerarg value="-Xlint:-path"/>
+      </javac>
+
+      <java classname="com.amd.aparapi.CreateJUnitTests" classpathref="classpath">
+         <sysproperty key="root" value="${basedir}"/>
+      </java>
+
+      <javac debug="true"
+      	 debuglevel="lines,vars,source"
+         srcdir="src/genjava" 
+      	 destdir="classes" 
+      	 includeAntRuntime="false"
+      	 classpathref="classpath">
+      	    <compilerarg value="-Xlint"/>
+      	   	<compilerarg value="-Xlint:-path"/>
+      </javac>
+      
+   	  <mkdir dir="junit"/>
+      <mkdir dir="junit/data"/>
+      
+   	  <junit printsummary="false" fork="false" haltonfailure="false" failureproperty="tests.failed" showoutput="false">
+         <formatter type="xml" />
+         <classpath refid="classpath"/>
+         <batchtest todir="junit/data">
+            <fileset dir="src/genjava"/> 
+         </batchtest>
+      </junit>
+
+      <junitreport todir="junit/data">
+         <fileset dir="junit/data"/>
+         <report format="frames" todir="junit/html" />
+      </junitreport>
+   </target>
+
+</project>