diff --git a/packages/-ember-data/package.json b/packages/-ember-data/package.json
index 66d5cafce3..4bfec06115 100644
--- a/packages/-ember-data/package.json
+++ b/packages/-ember-data/package.json
@@ -127,7 +127,7 @@
   "peerDependencies": {
     "ember-source": "3.28.12 || ^4.0.4 || ^5.0.0 || ^6.0.0",
     "@ember/test-helpers": "^3.3.0 || ^4.0.4",
-    "@ember/test-waiters": "^3.1.0",
+    "@ember/test-waiters": "^3.1.0 || ^4.0.0",
     "qunit": "^2.18.0"
   },
   "peerDependenciesMeta": {
diff --git a/packages/ember/package.json b/packages/ember/package.json
index 726bd52f2c..b75e7baea9 100644
--- a/packages/ember/package.json
+++ b/packages/ember/package.json
@@ -50,7 +50,7 @@
     "@ember-data/tracking": "^4.12.7 || > 5.3.3"
   },
   "dependencies": {
-    "@ember/test-waiters": "^3.1.0",
+    "@ember/test-waiters": "^3.1.0 || ^4.0.0",
     "@embroider/macros": "^1.16.6",
     "@warp-drive/build-config": "workspace:0.0.0-alpha.58"
   },
diff --git a/packages/legacy-compat/package.json b/packages/legacy-compat/package.json
index e5197c831e..eedcfc41aa 100644
--- a/packages/legacy-compat/package.json
+++ b/packages/legacy-compat/package.json
@@ -95,7 +95,7 @@
     "@ember-data/request": "workspace:5.4.0-alpha.121",
     "@ember-data/request-utils": "workspace:5.4.0-alpha.121",
     "@ember-data/store": "workspace:5.4.0-alpha.121",
-    "@ember/test-waiters": "^3.1.0",
+    "@ember/test-waiters": "^3.1.0 || >= 4.0.0",
     "@warp-drive/core-types": "workspace:0.0.0-alpha.107"
   },
   "devDependencies": {
diff --git a/packages/request/package.json b/packages/request/package.json
index 6a0162bf2f..cc26250b01 100644
--- a/packages/request/package.json
+++ b/packages/request/package.json
@@ -43,7 +43,7 @@
     "@warp-drive/core-types": "workspace:0.0.0-alpha.107"
   },
   "dependencies": {
-    "@ember/test-waiters": "^3.1.0",
+    "@ember/test-waiters": "^3.1.0 || ^4.0.0",
     "@embroider/macros": "^1.16.6",
     "@warp-drive/build-config": "workspace:0.0.0-alpha.58"
   },
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 1315ee1aa5..283cf62e07 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -824,7 +824,7 @@ importers:
   packages/ember:
     dependencies:
       '@ember/test-waiters':
-        specifier: ^3.1.0
+        specifier: ^3.1.0 || ^4.0.0
         version: 3.1.0(@babel/core@7.24.5)
       '@embroider/macros':
         specifier: ^1.16.6
@@ -1397,7 +1397,7 @@ importers:
   packages/request:
     dependencies:
       '@ember/test-waiters':
-        specifier: ^3.1.0
+        specifier: ^3.1.0 || ^4.0.0
         version: 3.1.0(@babel/core@7.24.5)
       '@embroider/macros':
         specifier: ^1.16.6
@@ -2346,7 +2346,7 @@ importers:
         specifier: 4.0.4
         version: 4.0.4(patch_hash=zignhd6n3rugkiuawsmbuxfdka)(@babel/core@7.24.5)(@glint/template@1.5.0)(ember-source@5.12.0)
       '@ember/test-waiters':
-        specifier: ^3.1.0
+        specifier: ^3.1.0 || ^4.0.0
         version: 3.1.0(@babel/core@7.24.5)
       '@embroider/addon-shim':
         specifier: ^1.8.9
@@ -23513,7 +23513,7 @@ packages:
     engines: {node: '>= 18.20.4'}
     peerDependencies:
       '@ember/test-helpers': ^3.3.0 || ^4.0.4
-      '@ember/test-waiters': ^3.1.0
+      '@ember/test-waiters': ^3.1.0 || ^4.0.0
       ember-source: '*'
       qunit: 2.19.4
     peerDependenciesMeta:
@@ -23558,7 +23558,7 @@ packages:
     engines: {node: '>= 18.20.4'}
     peerDependencies:
       '@ember/test-helpers': ^3.3.0 || ^4.0.4
-      '@ember/test-waiters': ^3.1.0
+      '@ember/test-waiters': ^3.1.0 || ^4.0.0
       ember-source: '*'
       qunit: 2.19.4
     peerDependenciesMeta:
@@ -23602,7 +23602,7 @@ packages:
     engines: {node: '>= 18.20.4'}
     peerDependencies:
       '@ember/test-helpers': ^3.3.0 || ^4.0.4
-      '@ember/test-waiters': ^3.1.0
+      '@ember/test-waiters': ^3.1.0 || ^4.0.0
       ember-source: '*'
       qunit: 2.19.4
     peerDependenciesMeta:
@@ -23646,7 +23646,7 @@ packages:
     engines: {node: '>= 18.20.4'}
     peerDependencies:
       '@ember/test-helpers': ^3.3.0 || ^4.0.4
-      '@ember/test-waiters': ^3.1.0
+      '@ember/test-waiters': ^3.1.0 || ^4.0.0
       ember-source: '*'
       qunit: 2.19.4
     peerDependenciesMeta:
@@ -24256,7 +24256,7 @@ packages:
       '@ember-data/request': workspace:5.4.0-alpha.121
       '@ember-data/request-utils': workspace:5.4.0-alpha.121
       '@ember-data/store': workspace:5.4.0-alpha.121
-      '@ember/test-waiters': ^3.1.0
+      '@ember/test-waiters': ^3.1.0 || >= 4.0.0
       '@warp-drive/core-types': workspace:0.0.0-alpha.107
       ember-source: '*'
     peerDependenciesMeta:
@@ -24292,7 +24292,7 @@ packages:
       '@ember-data/request': workspace:5.4.0-alpha.121
       '@ember-data/request-utils': workspace:5.4.0-alpha.121
       '@ember-data/store': workspace:5.4.0-alpha.121
-      '@ember/test-waiters': ^3.1.0
+      '@ember/test-waiters': ^3.1.0 || >= 4.0.0
       '@warp-drive/core-types': workspace:0.0.0-alpha.107
       ember-source: '*'
     peerDependenciesMeta:
@@ -24327,7 +24327,7 @@ packages:
       '@ember-data/request': workspace:5.4.0-alpha.121
       '@ember-data/request-utils': workspace:5.4.0-alpha.121
       '@ember-data/store': workspace:5.4.0-alpha.121
-      '@ember/test-waiters': ^3.1.0
+      '@ember/test-waiters': ^3.1.0 || >= 4.0.0
       '@warp-drive/core-types': workspace:0.0.0-alpha.107
       ember-source: '*'
     peerDependenciesMeta:
diff --git a/tests/ember-data__adapter/package.json b/tests/ember-data__adapter/package.json
index d7905edf1c..746e2cf97f 100644
--- a/tests/ember-data__adapter/package.json
+++ b/tests/ember-data__adapter/package.json
@@ -86,7 +86,7 @@
     "@ember-data/unpublished-test-infra": "workspace:5.4.0-alpha.121",
     "@ember/optional-features": "^2.1.0",
     "@ember/test-helpers": "4.0.4",
-    "@ember/test-waiters": "^3.1.0",
+    "@ember/test-waiters": "^3.1.0 || ^4.0.0",
     "@embroider/addon-shim": "^1.8.9",
     "@glimmer/component": "^1.1.2",
     "@glimmer/tracking": "^1.1.2",