diff --git a/src/test/java/com/aparapi/runtime/AtomicsSupportAdvTest.java b/src/test/java/com/aparapi/runtime/AtomicsSupportAdvTest.java
index e9daf33a7546a3bf499890fee0b8366588a776ea..94a8a62cab03ce6708cf92c025b8e939a158e2a5 100644
--- a/src/test/java/com/aparapi/runtime/AtomicsSupportAdvTest.java
+++ b/src/test/java/com/aparapi/runtime/AtomicsSupportAdvTest.java
@@ -24,7 +24,7 @@ import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.junit.AfterClass;
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -76,8 +76,8 @@ public class AtomicsSupportAdvTest {
         openCLDevice = (OpenCLDevice) device;
     }
 
-    @AfterClass
-    public static void classTeardown() {
+    @After
+    public void classTeardown() {
     	Util.resetKernelManager();
     }
     
diff --git a/src/test/java/com/aparapi/runtime/AtomicsSupportTest.java b/src/test/java/com/aparapi/runtime/AtomicsSupportTest.java
index ef9bd22f0928547120453a37f3fec06a23e5f2e3..b7aca3cc7210163644e4020652f61f7e4b1074e3 100644
--- a/src/test/java/com/aparapi/runtime/AtomicsSupportTest.java
+++ b/src/test/java/com/aparapi/runtime/AtomicsSupportTest.java
@@ -23,7 +23,7 @@ import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.junit.AfterClass;
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -61,8 +61,8 @@ public class AtomicsSupportTest {
     	}
     }
     
-    @AfterClass
-    public static void classTeardown() {
+    @After
+    public void classTeardown() {
     	Util.resetKernelManager();
     }
     
diff --git a/src/test/java/com/aparapi/runtime/LocalArrayArgsTest.java b/src/test/java/com/aparapi/runtime/LocalArrayArgsTest.java
index d8d4987be8237cf21f8b079e3ad83829130c1b06..2ea3ba7b4318ea6d816a3e1cf44b1898b665293e 100644
--- a/src/test/java/com/aparapi/runtime/LocalArrayArgsTest.java
+++ b/src/test/java/com/aparapi/runtime/LocalArrayArgsTest.java
@@ -41,7 +41,7 @@ public class LocalArrayArgsTest {
     }
 
     @After
-    public static void classTeardown() {
+    public void classTeardown() {
         Util.resetKernelManager();
     }
     
diff --git a/src/test/java/com/aparapi/runtime/NegativeIntegerTest.java b/src/test/java/com/aparapi/runtime/NegativeIntegerTest.java
index 183bc772d2ab1c0f3f08d3281261f8aaca28727c..8cd9a5405601e608c24796bf2b0884dbed8d3250 100644
--- a/src/test/java/com/aparapi/runtime/NegativeIntegerTest.java
+++ b/src/test/java/com/aparapi/runtime/NegativeIntegerTest.java
@@ -21,7 +21,7 @@ import static org.junit.Assume.assumeTrue;
 import java.util.Arrays;
 import java.util.List;
 
-import org.junit.AfterClass;
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
@@ -59,8 +59,8 @@ public class NegativeIntegerTest
         openCLDevice = (OpenCLDevice) device;
     }
     
-    @AfterClass
-    public static void classTeardown() {
+    @After
+    public void classTeardown() {
     	Util.resetKernelManager();
     }
     
diff --git a/src/test/java/com/aparapi/runtime/ProfileReportBackwardsCompatTest.java b/src/test/java/com/aparapi/runtime/ProfileReportBackwardsCompatTest.java
index 83b2451e1ba1fbda45a65eacc80450877bf1076b..180fdc45d41192e17e092345259a958a47554248 100644
--- a/src/test/java/com/aparapi/runtime/ProfileReportBackwardsCompatTest.java
+++ b/src/test/java/com/aparapi/runtime/ProfileReportBackwardsCompatTest.java
@@ -169,7 +169,7 @@ public class ProfileReportBackwardsCompatTest {
      * This test executes two threads one for each kernel on an OpenCL device and checks that the traditional Aparapi profiling interfaces work. 
      * @throws Exception 
      */
-    //@Test
+    @Test
     public void threadedSingleThreadPerKernelOpenCLTest() throws Exception {
     	setUpBefore();
     	logger.log(Level.INFO, "Test " + name.getMethodName() + " - Executing on device: " + openCLDevice.getShortDescription() + " - " + openCLDevice.getName());