diff --git a/src/test/java/com/aparapi/runtime/LocalArrayArgsTest.java b/src/test/java/com/aparapi/runtime/LocalArrayArgsTest.java
index 3f5e805269884fa4dd9bc6adbf928678d3bc92e0..d8d4987be8237cf21f8b079e3ad83829130c1b06 100644
--- a/src/test/java/com/aparapi/runtime/LocalArrayArgsTest.java
+++ b/src/test/java/com/aparapi/runtime/LocalArrayArgsTest.java
@@ -24,6 +24,7 @@ import com.aparapi.internal.kernel.KernelManager;
 import static org.junit.Assert.*;
 import static org.junit.Assume.*;
 
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -39,6 +40,12 @@ public class LocalArrayArgsTest {
         openCLDevice = (OpenCLDevice) device;
     }
 
+    @After
+    public static void classTeardown() {
+        Util.resetKernelManager();
+    }
+    
+
     @Test
     public void test() {
         final LocalArrayArgsKernel kernel = new LocalArrayArgsKernel();
diff --git a/src/test/java/com/aparapi/runtime/MultiDimensionalLocalArrayTest.java b/src/test/java/com/aparapi/runtime/MultiDimensionalLocalArrayTest.java
index 7eb5461c9c47ebc7122ca10f90b085fed61468ad..8292c8175dacb86b3c79ab4b96c78415b2b4173a 100644
--- a/src/test/java/com/aparapi/runtime/MultiDimensionalLocalArrayTest.java
+++ b/src/test/java/com/aparapi/runtime/MultiDimensionalLocalArrayTest.java
@@ -22,7 +22,7 @@ import java.util.Arrays;
 import java.util.LinkedHashSet;
 import java.util.List;
 
-import org.junit.AfterClass;
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
@@ -61,7 +61,7 @@ public class MultiDimensionalLocalArrayTest
     	}
     }
 
-    @AfterClass
+    @After
     public static void classTeardown() {
     	Util.resetKernelManager();
     }