5 files changed, 6 insertions, 18 deletions
diff --git a/test/com/jogamp/opencl/CLBufferTest.java b/test/com/jogamp/opencl/CLBufferTest.java
index 1b9b8357..0638844d 100644
--- a/test/com/jogamp/opencl/CLBufferTest.java
+++ b/test/com/jogamp/opencl/CLBufferTest.java
@@ -51,8 +51,8 @@ import org.junit.runners.MethodSorters;
 
 import static org.junit.Assert.*;
 import static java.lang.System.*;
-import static com.jogamp.opencl.TestUtils.*;
 import static com.jogamp.common.nio.Buffers.*;
+import static com.jogamp.opencl.test.util.MiscUtils.*;
 import static com.jogamp.opencl.util.CLPlatformFilters.*;
 import static com.jogamp.opencl.CLVersion.*;
 
diff --git a/test/com/jogamp/opencl/CLCommandQueueTest.java b/test/com/jogamp/opencl/CLCommandQueueTest.java
index cc8a6d82..c9b1b567 100644
--- a/test/com/jogamp/opencl/CLCommandQueueTest.java
+++ b/test/com/jogamp/opencl/CLCommandQueueTest.java
@@ -53,7 +53,7 @@ import org.junit.Test;
 
 import static org.junit.Assert.*;
 import static java.lang.System.*;
-import static com.jogamp.opencl.TestUtils.*;
+import static com.jogamp.opencl.test.util.MiscUtils.*;
 import static com.jogamp.opencl.CLEvent.*;
 import static com.jogamp.opencl.CLVersion.*;
 import static com.jogamp.common.nio.Buffers.*;
diff --git a/test/com/jogamp/opencl/HighLevelBindingTest.java b/test/com/jogamp/opencl/HighLevelBindingTest.java
index bdff8041..6dd6a73f 100644
--- a/test/com/jogamp/opencl/HighLevelBindingTest.java
+++ b/test/com/jogamp/opencl/HighLevelBindingTest.java
@@ -56,7 +56,7 @@ import org.junit.runners.MethodSorters;
 
 import static org.junit.Assert.*;
 import static java.lang.System.*;
-import static com.jogamp.opencl.TestUtils.*;
+import static com.jogamp.opencl.test.util.MiscUtils.*;
 import static com.jogamp.opencl.util.CLPlatformFilters.*;
 import static com.jogamp.opencl.CLVersion.*;
 import static com.jogamp.opencl.CLDevice.Type.*;
diff --git a/test/com/jogamp/opencl/LowLevelBindingTest.java b/test/com/jogamp/opencl/LowLevelBindingTest.java
index a4135b98..2780c07a 100644
--- a/test/com/jogamp/opencl/LowLevelBindingTest.java
+++ b/test/com/jogamp/opencl/LowLevelBindingTest.java
@@ -57,8 +57,8 @@ import static java.lang.System.*;
 import static org.junit.Assert.*;
 import static com.jogamp.common.nio.Buffers.*;
 import static com.jogamp.common.os.Platform.*;
+import static com.jogamp.opencl.test.util.MiscUtils.*;
 import static com.jogamp.opencl.util.CLUtil.*;
-import static com.jogamp.opencl.TestUtils.*;
 
 /**
  * Test testing the low level bindings.
diff --git a/test/com/jogamp/opencl/TestUtils.java b/test/com/jogamp/opencl/test/util/MiscUtils.java
index a5c4e2b3..5d74eb45 100644
--- a/test/com/jogamp/opencl/TestUtils.java
+++ b/test/com/jogamp/opencl/test/util/MiscUtils.java
@@ -26,25 +26,18 @@
  * or implied, of JogAmp Community.
  */
 
-package com.jogamp.opencl;
+package com.jogamp.opencl.test.util;
 
-import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.util.Random;
 
-import org.junit.FixMethodOrder;
-import org.junit.runners.MethodSorters;
-
-import com.jogamp.opencl.test.util.UITestCase;
-
 import static java.lang.System.*;
 import static org.junit.Assert.*;
 
 /**
  * @author Michael Bien, et.al
  */
-@FixMethodOrder(MethodSorters.NAME_ASCENDING)
-public class TestUtils extends UITestCase {
+public class MiscUtils {
 
     //decrease this value on systems with few memory.
     final static int ONE_MB = 1048576;
@@ -84,9 +77,4 @@ public class TestUtils extends UITestCase {
         a.rewind();
         b.rewind();
     }
-
-    public static void main(String[] args) throws IOException {
-        String tstname = TestUtils.class.getName();
-        org.junit.runner.JUnitCore.main(tstname);
-    }
 }