1 files changed, 7 insertions, 4 deletions
diff --git a/build.sbt b/build.sbt
index 25b38fe4..0d050f9d 100644
--- a/build.sbt
+++ b/build.sbt
@@ -109,14 +109,17 @@ lazy val chiselSettings = Seq (
     "org.scalacheck" %% "scalacheck" % "1.14.0" % "test",
     "com.github.scopt" %% "scopt" % "3.7.0"
   ),
-
+  javacOptions ++= javacOptionsVersion(scalaVersion.value)
+) ++ (
   // Tests from other projects may still run concurrently
   //  if we're not running with -DminimalResources.
   // Another option would be to experiment with:
   //  concurrentRestrictions in Global += Tags.limit(Tags.Test, 1),
-  Test / parallelExecution := !sys.props.contains("minimalResources"),
-
-  javacOptions ++= javacOptionsVersion(scalaVersion.value)
+  sys.props.contains("minimalResources") match {
+    case true  => Seq( Test / parallelExecution := false )
+    case false => Seq( fork := true,
+                       Test / testForkedParallel := true )
+  }
 )
 
 lazy val coreMacros = (project in file("coreMacros")).