diff --git a/src/test/java/com/aparapi/runtime/BarrierSupportCPUOnlyMax256WorkGroupTest.java b/src/test/java/com/aparapi/runtime/BarrierSupportCPUOnlyMax256WorkGroupTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..a5a6833f2f9f1b4620512ed2dee23138ee18dcaa
--- /dev/null
+++ b/src/test/java/com/aparapi/runtime/BarrierSupportCPUOnlyMax256WorkGroupTest.java
@@ -0,0 +1,56 @@
+/**
+ * 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 BarrierSupportCPUOnlyMax256WorkGroupTest extends BarrierSupportTest {
+    protected class CLKernelManager extends KernelManager {
+        protected List<Device.TYPE> getPreferredDeviceTypes() {
+            return Arrays.asList(Device.TYPE.CPU);
+        }
+    }
+
+    @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/BarrierSupportCPUOnlyTest.java b/src/test/java/com/aparapi/runtime/BarrierSupportCPUOnlyTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..4b76fd2da20e390785f9629d5f8ea2bcafbbd9a9
--- /dev/null
+++ b/src/test/java/com/aparapi/runtime/BarrierSupportCPUOnlyTest.java
@@ -0,0 +1,52 @@
+/**
+ * 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 BarrierSupportCPUOnlyTest extends BarrierSupportTest {
+    protected class CLKernelManager extends KernelManager {
+        protected List<Device.TYPE> getPreferredDeviceTypes() {
+            return Arrays.asList(Device.TYPE.CPU);
+        }
+    }
+
+    @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();
+    }
+}
\ 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 f5bf29d09313fb026778ec5db835266ba3243293..239115e3307ecb603af20e23e6b408f972f50a1a 100644
--- a/src/test/java/com/aparapi/runtime/BarrierSupportTest.java
+++ b/src/test/java/com/aparapi/runtime/BarrierSupportTest.java
@@ -41,7 +41,7 @@ public class BarrierSupportTest {
     protected class CLKernelManager extends KernelManager {
     	@Override
     	protected List<Device.TYPE> getPreferredDeviceTypes() {
-    		return Arrays.asList(Device.TYPE.ACC, Device.TYPE.GPU, Device.TYPE.CPU);
+    		return Arrays.asList(Device.TYPE.ACC, Device.TYPE.GPU);
     	}
     }