diff --git a/integration/src/test/scala/ammonite/integration/BasicTests.scala b/integration/src/test/scala/ammonite/integration/BasicTests.scala
index 955f7208e..fe3028168 100644
--- a/integration/src/test/scala/ammonite/integration/BasicTests.scala
+++ b/integration/src/test/scala/ammonite/integration/BasicTests.scala
@@ -119,7 +119,7 @@ object BasicTests extends TestSuite{
     }
 
 
-    test("shell"){
+    def shellTest() = {
       // make sure you can load the example-predef.sc, have it pull stuff in
       // from ivy, and make use of `cd!` and `wd` inside the executed script.
       val res = os.proc(
@@ -143,6 +143,15 @@ object BasicTests extends TestSuite{
         // seems the script is run only until the first '@' on Windows
         assert(output == "amm/src")
     }
+    test("shell"){
+      // FIXME In Scala 3.0.0-M1, etting errors like
+      //   java.lang.AssertionError: assertion failed:
+      //     duplicate type CC#31508; previous was type CC#31500
+      if (isScala2)
+        shellTest()
+      else
+        "Disabled in Scala 3"
+    }
 
     // Ensure we can load the source code of the built-in Java standard library
     test("source"){