diff --git a/server-test/src/server-test/buildserver/build.sbt b/server-test/src/server-test/buildserver/build.sbt
index 52691a0a5..9d2de35fc 100644
--- a/server-test/src/server-test/buildserver/build.sbt
+++ b/server-test/src/server-test/buildserver/build.sbt
@@ -1,10 +1,16 @@
-ThisBuild / scalaVersion := "2.13.1"
+ThisBuild / scalaVersion := "2.13.8"
 
 Global / serverLog / logLevel := Level.Debug
 
 lazy val runAndTest = project.in(file("run-and-test"))
   .settings(
+    libraryDependencies += "com.github.plokhotnyuk.jsoniter-scala" %% "jsoniter-scala-core" % "2.13.11",
     libraryDependencies += "org.scalatest" %% "scalatest" % "3.0.8" % "test",
+    Compile / javaOptions := Vector("Xmx256M"),
+    Compile / envVars := Map("KEY" -> "VALUE"),
+
+    Test / javaOptions := Vector("Xmx512M"),
+    Test / envVars := Map("KEY_TEST" -> "VALUE_TEST"),
   )
   .dependsOn(util)
 
diff --git a/server-test/src/test/scala/testpkg/BuildServerTest.scala b/server-test/src/test/scala/testpkg/BuildServerTest.scala
index a6d900a16..817b0e6ad 100644
--- a/server-test/src/test/scala/testpkg/BuildServerTest.scala
+++ b/server-test/src/test/scala/testpkg/BuildServerTest.scala
@@ -157,7 +157,7 @@ object BuildServerTest extends AbstractServerTest {
     assert(processing("buildTarget/scalacOptions"))
     assert(svr.waitForString(10.seconds) { s =>
       (s contains """"id":"40"""") &&
-      (s contains "scala-library-2.13.1.jar")
+      (s contains "scala-library-2.13.8.jar")
     })
   }
 
@@ -311,6 +311,49 @@ object BuildServerTest extends AbstractServerTest {
     })
   }
 
+  test("buildTarget/jvmRunEnvironment") { _ =>
+    val buildTarget = buildTargetUri("runAndTest", "Compile")
+    svr.sendJsonRpc(
+      s"""|{ "jsonrpc": "2.0",
+          |  "id": "97",
+          |  "method": "buildTarget/jvmRunEnvironment",
+          |  "params": { "targets": [{ "uri": "$buildTarget" }] }
+          |}""".stripMargin
+    )
+    assert(processing("buildTarget/jvmRunEnvironment"))
+    assert {
+      svr.waitForString(10.seconds) { s =>
+        (s contains """"id":"97"""") &&
+        (s contains "jsoniter-scala-core_2.13-2.13.11.jar") && // compile dependency
+        (s contains "\"jvmOptions\":[\"Xmx256M\"]") &&
+        (s contains "\"environmentVariables\":{\"KEY\":\"VALUE\"}") &&
+        (s contains "/buildserver/run-and-test/") // working directory
+      }
+    }
+  }
+
+  test("buildTarget/jvmTestEnvironment") { _ =>
+    val buildTarget = buildTargetUri("runAndTest", "Test")
+    svr.sendJsonRpc(
+      s"""|{ "jsonrpc": "2.0", 
+          |  "id": "98", 
+          |  "method": "buildTarget/jvmTestEnvironment", 
+          |  "params": { "targets": [{ "uri": "$buildTarget" }] } 
+          |}""".stripMargin
+    )
+    assert(processing("buildTarget/jvmTestEnvironment"))
+    assert {
+      svr.waitForString(10.seconds) { s =>
+        (s contains """"id":"98"""") &&
+        // test depends on compile so it has dependencies from both
+        (s contains "jsoniter-scala-core_2.13-2.13.11.jar") && // compile dependency
+        (s contains "scalatest_2.13-3.0.8.jar") && // test dependency
+        (s contains "\"jvmOptions\":[\"Xmx512M\"]") &&
+        (s contains "\"environmentVariables\":{\"KEY_TEST\":\"VALUE_TEST\"}")
+      }
+    }
+  }
+
   test("buildTarget/scalaTestClasses") { _ =>
     val buildTarget = buildTargetUri("runAndTest", "Test")
     val badBuildTarget = buildTargetUri("badBuildTarget", "Test")