diff --git a/integration/derp_verify_endpoint_test.go b/integration/derp_verify_endpoint_test.go
index 6be5927a0b..adad5b6a49 100644
--- a/integration/derp_verify_endpoint_test.go
+++ b/integration/derp_verify_endpoint_test.go
@@ -33,10 +33,10 @@ func TestDERPVerifyEndpoint(t *testing.T) {
 
 	scenario, err := NewScenario(dockertestMaxWait())
 	assertNoErr(t, err)
-	defer scenario.Shutdown()
+	defer scenario.ShutdownAssertNoPanics(t)
 
 	spec := map[string]int{
-		"user1": 10,
+		"user1": len(MustTestVersions),
 	}
 
 	derper, err := scenario.CreateDERPServer("head",
diff --git a/integration/hsic/hsic.go b/integration/hsic/hsic.go
index 3b4d0905f0..8c379dc8d0 100644
--- a/integration/hsic/hsic.go
+++ b/integration/hsic/hsic.go
@@ -25,6 +25,7 @@ import (
 	"github.com/juanfont/headscale/integration/integrationutil"
 	"github.com/ory/dockertest/v3"
 	"github.com/ory/dockertest/v3/docker"
+	"gopkg.in/yaml.v3"
 	"tailscale.com/tailcfg"
 )
 
@@ -221,7 +222,7 @@ func WithEmbeddedDERPServerOnly() Option {
 // DERP server only.
 func WithDERPConfig(derpMap tailcfg.DERPMap) Option {
 	return func(hsic *HeadscaleInContainer) {
-		contents, err := json.Marshal(derpMap)
+		contents, err := yaml.Marshal(derpMap)
 		if err != nil {
 			log.Fatalf("failed to marshal DERP map: %s", err)