diff --git a/integrationtests/chrome_test.go b/integrationtests/chrome_test.go
index 32465a421..5398cc4a8 100644
--- a/integrationtests/chrome_test.go
+++ b/integrationtests/chrome_test.go
@@ -79,6 +79,9 @@ var _ = Describe("Chrome tests", func() {
 				}
 				supportedVersionsBefore = protocol.SupportedVersions
 				protocol.SupportedVersions = []protocol.VersionNumber{version}
+			})
+
+			JustBeforeEach(func() {
 				wd = getWebdriverForVersion(version)
 			})
 
diff --git a/integrationtests/integrationtests_suite_test.go b/integrationtests/integrationtests_suite_test.go
index 3b764c573..3c661f5ad 100644
--- a/integrationtests/integrationtests_suite_test.go
+++ b/integrationtests/integrationtests_suite_test.go
@@ -61,14 +61,10 @@ func TestIntegration(t *testing.T) {
 
 var _ = BeforeSuite(func() {
 	setupHTTPHandlers()
-	setupQuicServer()
 	setupSelenium()
 })
 
 var _ = AfterSuite(func() {
-	err := server.Close()
-	Expect(err).NotTo(HaveOccurred())
-
 	stopSelenium()
 }, 10)
 
@@ -104,7 +100,11 @@ var _ = BeforeEach(func() {
 	}
 })
 
+var _ = JustBeforeEach(startQuicServer)
+
 var _ = AfterEach(func() {
+	stopQuicServer()
+
 	// remove uploadDir
 	if len(uploadDir) < 20 {
 		panic("uploadDir too short")
@@ -187,7 +187,7 @@ func setupHTTPHandlers() {
 	})
 }
 
-func setupQuicServer() {
+func startQuicServer() {
 	server = &h2quic.Server{
 		Server: &http.Server{
 			TLSConfig: testdata.GetTLSConfig(),
@@ -206,6 +206,10 @@ func setupQuicServer() {
 	}()
 }
 
+func stopQuicServer() {
+	Expect(server.Close()).NotTo(HaveOccurred())
+}
+
 func setupSelenium() {
 	var err error
 	pullCmd := exec.Command("docker", "pull", "lclemente/standalone-chrome:dev")