diff --git a/CHANGELOG.md b/CHANGELOG.md
index d15acff5560484798406bf15e0a5f8868a0c1752..b12680aaf03eb76db23495925d282a788f30b0ae 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,8 @@
 * Fix code generation for Private memory space arrays
 * Fix regression with NoCL annotated methods called from Kernel.run() method
 * Add support for mad24 OpenCL call as a mapped Kernel method
+* Aparapi support for the Scala language is officially declared as broken
+* SimpleScalaTest unit tests are now disabled
 
 ## v3.0.0
 * Add support for getKernelMaxWorkGroupSize(), getKernelCompileWorkGroupSize(), getKernelPreferredWorkGroupSizeMultiple(), getKernelMinimumPrivateMemSizeInUsePerWorkItem() and getKernelLocalMemSizeInUse()
diff --git a/README.md b/README.md
index c2e541f97492f5558827bcd18d1002b731e4b155..79fb792b39d17e3150c4f2fc83959ebaba607ce9 100644
--- a/README.md
+++ b/README.md
@@ -119,3 +119,6 @@ Kernel kernel = new Kernel() {
 Range range = Range.create(result.length);
 kernel.execute(range);
 ```
+
+## Known Issues
+- Aparapi support for the Scala language is officially declared as broken
\ No newline at end of file
diff --git a/src/test/scala/com/aparapi/SimpleScalaTest.scala b/src/test/scala/com/aparapi/SimpleScalaTest.scala
index 20e76faa4589a7bacd686b6d6d06e45d10fb6f70..69164334ad2e2c5e75e66126e2311ea0b1d269a2 100644
--- a/src/test/scala/com/aparapi/SimpleScalaTest.scala
+++ b/src/test/scala/com/aparapi/SimpleScalaTest.scala
@@ -44,13 +44,17 @@ class SimpleScalaTest {
     KernelWriter.writeToString(entryPoint)
   }
 
-  @Test def testKernel(): Unit = {
+  //Unit test intentionally disabled until Scala support is fixed in Aparapi
+  //@Test def testKernel(): Unit = {
+  def testKernel(): Unit = {
     val a = Array.fill(50000)(Random.nextFloat())
     val b = Array.fill(50000)(Random.nextFloat())
     assertTrue(runKernel(a, b).length == 50000)
   }
 
-  @Test def testCL(): Unit = {
+  //Unit test intentionally disabled until Scala support is fixed in Aparapi
+  //@Test def testCL(): Unit = {
+  def testCL(): Unit = {
     val a = Array.fill(50000)(Random.nextFloat())
     val b = Array.fill(50000)(Random.nextFloat())
     val expected =