diff --git a/.github/workflows/autobahn.yml b/.github/workflows/autobahn.yml
index a73982f..20df45e 100644
--- a/.github/workflows/autobahn.yml
+++ b/.github/workflows/autobahn.yml
@@ -29,7 +29,7 @@ jobs:
       - name: Run autobahn tests (expected to have no panics)
         run: |
           docker run --rm \
-            -v "${PWD}/autobahn/config_prod.json:/autobahn.json" \
+            -v "${PWD}/autobahn/config.json:/autobahn.json" \
             -v "${PWD}/autobahn:/reports" \
             --network host \
             crossbario/autobahn-testsuite \
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d4ccefc..b65f040 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 # Unreleased
 
 - Change API of chunked response to match other streaming APIs
+- Remove `process.selector_receive_forever` so that handler process is not waiting until streaming actors are done
 
 # v1.0.1
 
diff --git a/Makefile b/Makefile
index cf1544b..81159a7 100644
--- a/Makefile
+++ b/Makefile
@@ -1,20 +1,8 @@
-autobahn_test_dev:
-	gleam run -m autobahn & sleep 1
+autobahn_test:
+	gleam run -m autobahn & sleep 2
 
 	docker run -it --rm \
-  -v "${PWD}/autobahn/config_dev.json:/autobahn.json" \
-  -v "${PWD}/autobahn:/reports" \
-  --network host \
-  crossbario/autobahn-testsuite \
-  wstest -m fuzzingclient -s /autobahn.json
-
-	kill $$(lsof -t -i:8080)
-
-autobahn_test_prod:
-	gleam run -m autobahn & sleep 1
-
-	docker run -it --rm \
-  -v "${PWD}/autobahn/config_prod.json:/autobahn.json" \
+  -v "${PWD}/autobahn/config.json:/autobahn.json" \
   -v "${PWD}/autobahn:/reports" \
   --network host \
   crossbario/autobahn-testsuite \
diff --git a/autobahn/config_dev.json b/autobahn/config.json
similarity index 100%
rename from autobahn/config_dev.json
rename to autobahn/config.json
diff --git a/autobahn/config_prod.json b/autobahn/config_prod.json
deleted file mode 100644
index 3ce20c8..0000000
--- a/autobahn/config_prod.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "outdir": "./reports/server",
-  "servers": [
-    {
-      "url": "ws://localhost:8080",
-      "agent": "ewe"
-    }
-  ],
-  "cases": ["1.*", "2.*", "5.3", "5.4", "5.5", "5.6", "5.7", "5.8", "5.19", "5.20", "6.1.*", "6.2.*", "6.5.*", "6.6.2", "6.6.5","6.6.7", "6.6.9", "6.6.11", "6.7.*","6.9.*", "6.11.1", "6.11.2", "6.11.3", "6.11.4", "6.22.*", "6.23.*", "7.1.*", "7.3.*", "7.7.*", "9.*", "10.*", "12.*", "13.*"],
-  "exclude-cases": ["2.5", "7.3.2"],
-  "exclude-agent-cases": {}
-}
\ No newline at end of file
diff --git a/test/autobahn.gleam b/test/autobahn.gleam
index f2335c3..24fbfbb 100644
--- a/test/autobahn.gleam
+++ b/test/autobahn.gleam
@@ -9,13 +9,6 @@ pub fn main() -> Nil {
 
   // spectator.start()
 
-  // Before running Autobahn tests, make sure to add this line to glisten/internal/acceptor.gleam:
-  // Replace line 140:
-  // |> supervisor.start
-  // With:
-  // |> supervisor.restart_tolerance(intensity: 1_000_000, period: 1_000_000)
-  // |> supervisor.start
-
   let ewe_server =
     ewe.new(fn(req) {
       ewe.upgrade_websocket(