diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
new file mode 100644
index 00000000..7e6f2579
--- /dev/null
+++ b/.devcontainer/devcontainer.json
@@ -0,0 +1,11 @@
+// For format details, see https://aka.ms/devcontainer.json. For config options, see the
+// README at: https://github.com/devcontainers/templates/tree/main/src/go
+{
+	"name": "Go",
+	// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
+	"image": "mcr.microsoft.com/devcontainers/go:0-1-bullseye",
+	"features": {
+		"ghcr.io/devcontainers/features/java:1": {
+		}
+	}
+}
diff --git a/server_java_test.go b/server_java_test.go
index dcada4a9..a1956363 100644
--- a/server_java_test.go
+++ b/server_java_test.go
@@ -67,7 +67,7 @@ func (srv *server) Start() error {
 	srv.cmd = exec.CommandContext(ctx, srv.cmdString, srv.cmdArgs...)
 	srv.cmd.Stdout = srv.stdout
 	srv.cmd.Stderr = srv.stderr
-	srv.cmd.Env = srv.cmdEnv
+	srv.cmd.Env = append(os.Environ(), srv.cmdEnv...)
 
 	return srv.cmd.Start()
 }