diff --git a/samples/convolution/src/com/amd/aparapi/sample/convolution/Test12x4_4x2.java b/test/runtime/src/java/com/amd/aparapi/test/runtime/Test12x4_4x2.java
similarity index 95%
rename from samples/convolution/src/com/amd/aparapi/sample/convolution/Test12x4_4x2.java
rename to test/runtime/src/java/com/amd/aparapi/test/runtime/Test12x4_4x2.java
index e68ca82cfd56c878bfe48ec9e78779cde98f71cf..51cee4366bdc15dc648cfb647976f9eb7cf423b0 100644
--- a/samples/convolution/src/com/amd/aparapi/sample/convolution/Test12x4_4x2.java
+++ b/test/runtime/src/java/com/amd/aparapi/test/runtime/Test12x4_4x2.java
@@ -1,10 +1,12 @@
-package com.amd.aparapi.sample.convolution;
+package com.amd.aparapi.test.runtime;
+
+import org.junit.Test;
 
 import com.amd.aparapi.Kernel;
 import com.amd.aparapi.Range;
 
 public class Test12x4_4x2{
-   public static void main(String[] _args) {
+   @Test public void test() {
       // globalThreadId, threadId, globalX, globalY, localX, localY
       final int[][] test = new int[][] {
             {
@@ -490,6 +492,7 @@ public class Test12x4_4x2{
          }
 
       };
+      kernel.setExecutionMode(Kernel.EXECUTION_MODE.JTP);
       kernel.execute(Range.create2D(12, 4, 4, 2));
 
    }