diff --git a/src/test/java/com/aparapi/runtime/BarrierSupportMax256WorkGroupTest.java b/src/test/java/com/aparapi/runtime/BarrierSupportMax256WorkGroupTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..b00fe7ea09ffe6ad6302b15c299b90e48a6d7016
--- /dev/null
+++ b/src/test/java/com/aparapi/runtime/BarrierSupportMax256WorkGroupTest.java
@@ -0,0 +1,50 @@
+/**
+ * Copyright (c) 2016 - 2018 Syncleus, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.aparapi.runtime;
+
+import com.aparapi.Kernel;
+import com.aparapi.Range;
+import com.aparapi.device.Device;
+import com.aparapi.device.JavaDevice;
+import com.aparapi.device.OpenCLDevice;
+import com.aparapi.internal.kernel.KernelManager;
+
+import static org.junit.Assert.*;
+import static org.junit.Assume.*;
+
+import java.util.Arrays;
+import java.util.LinkedHashSet;
+import java.util.List;
+
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.Test;
+
+public class BarrierSupportMax256WorkGroupTest extends BarrierSupportTest {
+    @Before
+    @Override
+    public void setUpBefore() throws Exception {
+    	KernelManager.setKernelManager(new CLKernelManager());
+        Device device = KernelManager.instance().bestDevice();
+        assumeTrue (device != null && device instanceof OpenCLDevice);
+        openCLDevice = (OpenCLDevice) device;
+        SIZE = openCLDevice.getMaxWorkGroupSize();
+        if (SIZE > 256) {
+            SIZE = 256;
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/src/test/java/com/aparapi/runtime/BarrierSupportTest.java b/src/test/java/com/aparapi/runtime/BarrierSupportTest.java
index b6b65c672b75858baa807d5dd75156a4fdc60ec0..f5bf29d09313fb026778ec5db835266ba3243293 100644
--- a/src/test/java/com/aparapi/runtime/BarrierSupportTest.java
+++ b/src/test/java/com/aparapi/runtime/BarrierSupportTest.java
@@ -34,18 +34,18 @@ import org.junit.Before;
 import org.junit.Test;
 
 public class BarrierSupportTest {
-    private static OpenCLDevice openCLDevice = null;
-    private static int SIZE;
-    private int[] targetArray;
+    protected static OpenCLDevice openCLDevice = null;
+    protected static int SIZE;
+    protected int[] targetArray;
 
-    private class CLKernelManager extends KernelManager {
+    protected class CLKernelManager extends KernelManager {
     	@Override
     	protected List<Device.TYPE> getPreferredDeviceTypes() {
     		return Arrays.asList(Device.TYPE.ACC, Device.TYPE.GPU, Device.TYPE.CPU);
     	}
     }
 
-    private class JTPKernelManager extends KernelManager {
+    protected class JTPKernelManager extends KernelManager {
     	private JTPKernelManager() {
     		LinkedHashSet<Device> preferredDevices = new LinkedHashSet<Device>(1);
     		preferredDevices.add(JavaDevice.THREAD_POOL);