2 files changed, 12 insertions, 5 deletions
diff --git a/integration/test/src/mill/integration/AcyclicTests.scala b/integration/test/src/mill/integration/AcyclicTests.scala
index d1035af0..c117f862 100644
--- a/integration/test/src/mill/integration/AcyclicTests.scala
+++ b/integration/test/src/mill/integration/AcyclicTests.scala
@@ -25,7 +25,7 @@ class AcyclicTests(fork: Boolean)
       assert(!brokenCompile)
     }
 
-    'scala2118 - check("2.11.8")
+    'scala2118 - mill.util.TestUtil.disableInJava9OrAbove(check("2.11.8"))
     'scala2124 - check("2.12.4")
 
   }
diff --git a/integration/test/src/mill/integration/UpickleTests.scala b/integration/test/src/mill/integration/UpickleTests.scala
index dba6488d..1b83c60f 100644
--- a/integration/test/src/mill/integration/UpickleTests.scala
+++ b/integration/test/src/mill/integration/UpickleTests.scala
@@ -6,12 +6,19 @@ import utest._
 class UpickleTests(fork: Boolean) extends IntegrationTestSuite("MILL_UPICKLE_REPO", "upickle", fork) {
   val tests = Tests{
     initWorkspace()
-    'jvm - {
-      assert(eval("upickleJvm[2.11.11].test"))
-      val jvmMeta = meta("upickleJvm[2.11.11].test.test")
+    'jvm21111 - {
+      mill.util.TestUtil.disableInJava9OrAbove({
+        assert(eval("upickleJvm[2.11.11].test"))
+        val jvmMeta = meta("upickleJvm[2.11.11].test.test")
+        assert(jvmMeta.contains("example.ExampleTests.simple"))
+        assert(jvmMeta.contains("upickle.MacroTests.commonCustomStructures.simpleAdt"))
+      })
+    }
+    'jvm2124 - {
+      assert(eval("upickleJvm[2.12.4].test"))
+      val jvmMeta = meta("upickleJvm[2.12.4].test.test")
       assert(jvmMeta.contains("example.ExampleTests.simple"))
       assert(jvmMeta.contains("upickle.MacroTests.commonCustomStructures.simpleAdt"))
-
     }
     'js - {
       assert(eval("upickleJs[2.12.4].test"))