diff --git a/packages/-ember-data/tests/dummy/config/targets.js b/packages/-ember-data/tests/dummy/config/targets.js
index b6756da2517..303f9b64713 100644
--- a/packages/-ember-data/tests/dummy/config/targets.js
+++ b/packages/-ember-data/tests/dummy/config/targets.js
@@ -1,11 +1,9 @@
 'use strict';
 
-let browsers = ['last 1 Chrome versions', 'last 1 Firefox versions', 'last 1 Safari versions'];
-const isProd = process.env.EMBER_ENV === 'production';
+const { allSupportedBrowsers, modernBrowsers } = require('@ember-data/unpublished-test-infra/browserlist');
 
-if (isProd) {
-  browsers = ['last 2 Chrome versions', 'last 2 Firefox versions', 'Safari 12', 'last 2 Edge versions'];
-}
+const isProd = process.env.EMBER_ENV === 'production';
+let browsers = isProd ? allSupportedBrowsers : modernBrowsers;
 
 module.exports = {
   browsers,
diff --git a/packages/adapter/tests/dummy/config/targets.js b/packages/adapter/tests/dummy/config/targets.js
index b6756da2517..303f9b64713 100644
--- a/packages/adapter/tests/dummy/config/targets.js
+++ b/packages/adapter/tests/dummy/config/targets.js
@@ -1,11 +1,9 @@
 'use strict';
 
-let browsers = ['last 1 Chrome versions', 'last 1 Firefox versions', 'last 1 Safari versions'];
-const isProd = process.env.EMBER_ENV === 'production';
+const { allSupportedBrowsers, modernBrowsers } = require('@ember-data/unpublished-test-infra/browserlist');
 
-if (isProd) {
-  browsers = ['last 2 Chrome versions', 'last 2 Firefox versions', 'Safari 12', 'last 2 Edge versions'];
-}
+const isProd = process.env.EMBER_ENV === 'production';
+let browsers = isProd ? allSupportedBrowsers : modernBrowsers;
 
 module.exports = {
   browsers,
diff --git a/packages/debug/tests/dummy/config/targets.js b/packages/debug/tests/dummy/config/targets.js
index b6756da2517..303f9b64713 100644
--- a/packages/debug/tests/dummy/config/targets.js
+++ b/packages/debug/tests/dummy/config/targets.js
@@ -1,11 +1,9 @@
 'use strict';
 
-let browsers = ['last 1 Chrome versions', 'last 1 Firefox versions', 'last 1 Safari versions'];
-const isProd = process.env.EMBER_ENV === 'production';
+const { allSupportedBrowsers, modernBrowsers } = require('@ember-data/unpublished-test-infra/browserlist');
 
-if (isProd) {
-  browsers = ['last 2 Chrome versions', 'last 2 Firefox versions', 'Safari 12', 'last 2 Edge versions'];
-}
+const isProd = process.env.EMBER_ENV === 'production';
+let browsers = isProd ? allSupportedBrowsers : modernBrowsers;
 
 module.exports = {
   browsers,
diff --git a/packages/model/tests/dummy/config/targets.js b/packages/model/tests/dummy/config/targets.js
index b6756da2517..303f9b64713 100644
--- a/packages/model/tests/dummy/config/targets.js
+++ b/packages/model/tests/dummy/config/targets.js
@@ -1,11 +1,9 @@
 'use strict';
 
-let browsers = ['last 1 Chrome versions', 'last 1 Firefox versions', 'last 1 Safari versions'];
-const isProd = process.env.EMBER_ENV === 'production';
+const { allSupportedBrowsers, modernBrowsers } = require('@ember-data/unpublished-test-infra/browserlist');
 
-if (isProd) {
-  browsers = ['last 2 Chrome versions', 'last 2 Firefox versions', 'Safari 12', 'last 2 Edge versions'];
-}
+const isProd = process.env.EMBER_ENV === 'production';
+let browsers = isProd ? allSupportedBrowsers : modernBrowsers;
 
 module.exports = {
   browsers,
diff --git a/packages/record-data/tests/dummy/config/targets.js b/packages/record-data/tests/dummy/config/targets.js
index b6756da2517..303f9b64713 100644
--- a/packages/record-data/tests/dummy/config/targets.js
+++ b/packages/record-data/tests/dummy/config/targets.js
@@ -1,11 +1,9 @@
 'use strict';
 
-let browsers = ['last 1 Chrome versions', 'last 1 Firefox versions', 'last 1 Safari versions'];
-const isProd = process.env.EMBER_ENV === 'production';
+const { allSupportedBrowsers, modernBrowsers } = require('@ember-data/unpublished-test-infra/browserlist');
 
-if (isProd) {
-  browsers = ['last 2 Chrome versions', 'last 2 Firefox versions', 'Safari 12', 'last 2 Edge versions'];
-}
+const isProd = process.env.EMBER_ENV === 'production';
+let browsers = isProd ? allSupportedBrowsers : modernBrowsers;
 
 module.exports = {
   browsers,
diff --git a/packages/serializer/tests/dummy/config/targets.js b/packages/serializer/tests/dummy/config/targets.js
index b6756da2517..303f9b64713 100644
--- a/packages/serializer/tests/dummy/config/targets.js
+++ b/packages/serializer/tests/dummy/config/targets.js
@@ -1,11 +1,9 @@
 'use strict';
 
-let browsers = ['last 1 Chrome versions', 'last 1 Firefox versions', 'last 1 Safari versions'];
-const isProd = process.env.EMBER_ENV === 'production';
+const { allSupportedBrowsers, modernBrowsers } = require('@ember-data/unpublished-test-infra/browserlist');
 
-if (isProd) {
-  browsers = ['last 2 Chrome versions', 'last 2 Firefox versions', 'Safari 12', 'last 2 Edge versions'];
-}
+const isProd = process.env.EMBER_ENV === 'production';
+let browsers = isProd ? allSupportedBrowsers : modernBrowsers;
 
 module.exports = {
   browsers,
diff --git a/packages/store/tests/dummy/config/targets.js b/packages/store/tests/dummy/config/targets.js
index b6756da2517..303f9b64713 100644
--- a/packages/store/tests/dummy/config/targets.js
+++ b/packages/store/tests/dummy/config/targets.js
@@ -1,11 +1,9 @@
 'use strict';
 
-let browsers = ['last 1 Chrome versions', 'last 1 Firefox versions', 'last 1 Safari versions'];
-const isProd = process.env.EMBER_ENV === 'production';
+const { allSupportedBrowsers, modernBrowsers } = require('@ember-data/unpublished-test-infra/browserlist');
 
-if (isProd) {
-  browsers = ['last 2 Chrome versions', 'last 2 Firefox versions', 'Safari 12', 'last 2 Edge versions'];
-}
+const isProd = process.env.EMBER_ENV === 'production';
+let browsers = isProd ? allSupportedBrowsers : modernBrowsers;
 
 module.exports = {
   browsers,
diff --git a/packages/unpublished-adapter-encapsulation-test-app/config/targets.js b/packages/unpublished-adapter-encapsulation-test-app/config/targets.js
index 7c76181f14f..303f9b64713 100644
--- a/packages/unpublished-adapter-encapsulation-test-app/config/targets.js
+++ b/packages/unpublished-adapter-encapsulation-test-app/config/targets.js
@@ -1,13 +1,9 @@
 'use strict';
 
-const browsers = ['last 1 Chrome versions', 'last 1 Firefox versions', 'last 1 Safari versions'];
+const { allSupportedBrowsers, modernBrowsers } = require('@ember-data/unpublished-test-infra/browserlist');
 
-const isCI = !!process.env.CI;
-const isProduction = process.env.EMBER_ENV === 'production';
-
-if (isCI || isProduction) {
-  browsers.push('ie 11');
-}
+const isProd = process.env.EMBER_ENV === 'production';
+let browsers = isProd ? allSupportedBrowsers : modernBrowsers;
 
 module.exports = {
   browsers,
diff --git a/packages/unpublished-adapter-encapsulation-test-app/package.json b/packages/unpublished-adapter-encapsulation-test-app/package.json
index 6a669eb1d8d..d59d9e7c4f6 100644
--- a/packages/unpublished-adapter-encapsulation-test-app/package.json
+++ b/packages/unpublished-adapter-encapsulation-test-app/package.json
@@ -23,10 +23,10 @@
     "@ember-data/record-data": "4.1.0-alpha.11",
     "@ember-data/serializer": "4.1.0-alpha.11",
     "@ember-data/store": "4.1.0-alpha.11",
+    "@ember-data/unpublished-test-infra": "4.1.0-alpha.11",
     "ember-inflector": "^4.0.1"
   },
   "devDependencies": {
-    "@ember-data/unpublished-test-infra": "4.1.0-alpha.11",
     "@ember/optional-features": "^2.0.0",
     "@ember/test-helpers": "^2.2.5",
     "broccoli-asset-rev": "^3.0.0",
diff --git a/packages/unpublished-debug-encapsulation-test-app/config/targets.js b/packages/unpublished-debug-encapsulation-test-app/config/targets.js
index 7c76181f14f..303f9b64713 100644
--- a/packages/unpublished-debug-encapsulation-test-app/config/targets.js
+++ b/packages/unpublished-debug-encapsulation-test-app/config/targets.js
@@ -1,13 +1,9 @@
 'use strict';
 
-const browsers = ['last 1 Chrome versions', 'last 1 Firefox versions', 'last 1 Safari versions'];
+const { allSupportedBrowsers, modernBrowsers } = require('@ember-data/unpublished-test-infra/browserlist');
 
-const isCI = !!process.env.CI;
-const isProduction = process.env.EMBER_ENV === 'production';
-
-if (isCI || isProduction) {
-  browsers.push('ie 11');
-}
+const isProd = process.env.EMBER_ENV === 'production';
+let browsers = isProd ? allSupportedBrowsers : modernBrowsers;
 
 module.exports = {
   browsers,
diff --git a/packages/unpublished-debug-encapsulation-test-app/package.json b/packages/unpublished-debug-encapsulation-test-app/package.json
index 795b7eb9f97..7d5608ab311 100644
--- a/packages/unpublished-debug-encapsulation-test-app/package.json
+++ b/packages/unpublished-debug-encapsulation-test-app/package.json
@@ -22,10 +22,10 @@
     "@ember-data/model": "4.1.0-alpha.11",
     "@ember-data/serializer": "4.1.0-alpha.11",
     "@ember-data/store": "4.1.0-alpha.11",
+    "@ember-data/unpublished-test-infra": "4.1.0-alpha.11",
     "ember-inflector": "^4.0.1"
   },
   "devDependencies": {
-    "@ember-data/unpublished-test-infra": "4.1.0-alpha.11",
     "@ember/optional-features": "^2.0.0",
     "@ember/test-helpers": "^2.2.5",
     "broccoli-asset-rev": "^3.0.0",
diff --git a/packages/unpublished-fastboot-test-app/config/targets.js b/packages/unpublished-fastboot-test-app/config/targets.js
index 7c76181f14f..303f9b64713 100644
--- a/packages/unpublished-fastboot-test-app/config/targets.js
+++ b/packages/unpublished-fastboot-test-app/config/targets.js
@@ -1,13 +1,9 @@
 'use strict';
 
-const browsers = ['last 1 Chrome versions', 'last 1 Firefox versions', 'last 1 Safari versions'];
+const { allSupportedBrowsers, modernBrowsers } = require('@ember-data/unpublished-test-infra/browserlist');
 
-const isCI = !!process.env.CI;
-const isProduction = process.env.EMBER_ENV === 'production';
-
-if (isCI || isProduction) {
-  browsers.push('ie 11');
-}
+const isProd = process.env.EMBER_ENV === 'production';
+let browsers = isProd ? allSupportedBrowsers : modernBrowsers;
 
 module.exports = {
   browsers,
diff --git a/packages/unpublished-fastboot-test-app/package.json b/packages/unpublished-fastboot-test-app/package.json
index cd61db5f3e6..41973f82638 100644
--- a/packages/unpublished-fastboot-test-app/package.json
+++ b/packages/unpublished-fastboot-test-app/package.json
@@ -19,11 +19,11 @@
     "test:scenario": "ember try:one"
   },
   "dependencies": {
+    "@ember-data/unpublished-test-infra": "4.1.0-alpha.11",
     "ember-data": "4.1.0-alpha.11",
     "ember-inflector": "^4.0.1"
   },
   "devDependencies": {
-    "@ember-data/unpublished-test-infra": "4.1.0-alpha.11",
     "@ember/optional-features": "^2.0.0",
     "@ember/test-helpers": "^2.2.5",
     "@types/ember": "^3.16.5",
diff --git a/packages/unpublished-model-encapsulation-test-app/config/targets.js b/packages/unpublished-model-encapsulation-test-app/config/targets.js
index 7c76181f14f..303f9b64713 100644
--- a/packages/unpublished-model-encapsulation-test-app/config/targets.js
+++ b/packages/unpublished-model-encapsulation-test-app/config/targets.js
@@ -1,13 +1,9 @@
 'use strict';
 
-const browsers = ['last 1 Chrome versions', 'last 1 Firefox versions', 'last 1 Safari versions'];
+const { allSupportedBrowsers, modernBrowsers } = require('@ember-data/unpublished-test-infra/browserlist');
 
-const isCI = !!process.env.CI;
-const isProduction = process.env.EMBER_ENV === 'production';
-
-if (isCI || isProduction) {
-  browsers.push('ie 11');
-}
+const isProd = process.env.EMBER_ENV === 'production';
+let browsers = isProd ? allSupportedBrowsers : modernBrowsers;
 
 module.exports = {
   browsers,
diff --git a/packages/unpublished-model-encapsulation-test-app/package.json b/packages/unpublished-model-encapsulation-test-app/package.json
index cabc6a48ddd..d47e56a1e93 100644
--- a/packages/unpublished-model-encapsulation-test-app/package.json
+++ b/packages/unpublished-model-encapsulation-test-app/package.json
@@ -23,10 +23,10 @@
     "@ember-data/private-build-infra": "4.1.0-alpha.11",
     "@ember-data/serializer": "4.1.0-alpha.11",
     "@ember-data/store": "4.1.0-alpha.11",
+    "@ember-data/unpublished-test-infra": "4.1.0-alpha.11",
     "ember-inflector": "^4.0.1"
   },
   "devDependencies": {
-    "@ember-data/unpublished-test-infra": "4.1.0-alpha.11",
     "@ember/optional-features": "^2.0.0",
     "@ember/test-helpers": "^2.2.5",
     "broccoli-asset-rev": "^3.0.0",
diff --git a/packages/unpublished-record-data-encapsulation-test-app/config/targets.js b/packages/unpublished-record-data-encapsulation-test-app/config/targets.js
index 7c76181f14f..303f9b64713 100644
--- a/packages/unpublished-record-data-encapsulation-test-app/config/targets.js
+++ b/packages/unpublished-record-data-encapsulation-test-app/config/targets.js
@@ -1,13 +1,9 @@
 'use strict';
 
-const browsers = ['last 1 Chrome versions', 'last 1 Firefox versions', 'last 1 Safari versions'];
+const { allSupportedBrowsers, modernBrowsers } = require('@ember-data/unpublished-test-infra/browserlist');
 
-const isCI = !!process.env.CI;
-const isProduction = process.env.EMBER_ENV === 'production';
-
-if (isCI || isProduction) {
-  browsers.push('ie 11');
-}
+const isProd = process.env.EMBER_ENV === 'production';
+let browsers = isProd ? allSupportedBrowsers : modernBrowsers;
 
 module.exports = {
   browsers,
diff --git a/packages/unpublished-record-data-encapsulation-test-app/package.json b/packages/unpublished-record-data-encapsulation-test-app/package.json
index b6db16054ea..dc17612df40 100644
--- a/packages/unpublished-record-data-encapsulation-test-app/package.json
+++ b/packages/unpublished-record-data-encapsulation-test-app/package.json
@@ -23,10 +23,10 @@
     "@ember-data/model": "4.1.0-alpha.11",
     "@ember-data/serializer": "4.1.0-alpha.11",
     "@ember-data/store": "4.1.0-alpha.11",
+    "@ember-data/unpublished-test-infra": "4.1.0-alpha.11",
     "ember-inflector": "^4.0.1"
   },
   "devDependencies": {
-    "@ember-data/unpublished-test-infra": "4.1.0-alpha.11",
     "@ember/optional-features": "^2.0.0",
     "@ember/test-helpers": "^2.2.5",
     "broccoli-asset-rev": "^3.0.0",
diff --git a/packages/unpublished-serializer-encapsulation-test-app/config/targets.js b/packages/unpublished-serializer-encapsulation-test-app/config/targets.js
index 7c76181f14f..303f9b64713 100644
--- a/packages/unpublished-serializer-encapsulation-test-app/config/targets.js
+++ b/packages/unpublished-serializer-encapsulation-test-app/config/targets.js
@@ -1,13 +1,9 @@
 'use strict';
 
-const browsers = ['last 1 Chrome versions', 'last 1 Firefox versions', 'last 1 Safari versions'];
+const { allSupportedBrowsers, modernBrowsers } = require('@ember-data/unpublished-test-infra/browserlist');
 
-const isCI = !!process.env.CI;
-const isProduction = process.env.EMBER_ENV === 'production';
-
-if (isCI || isProduction) {
-  browsers.push('ie 11');
-}
+const isProd = process.env.EMBER_ENV === 'production';
+let browsers = isProd ? allSupportedBrowsers : modernBrowsers;
 
 module.exports = {
   browsers,
diff --git a/packages/unpublished-serializer-encapsulation-test-app/package.json b/packages/unpublished-serializer-encapsulation-test-app/package.json
index de8c2025a10..86db6dedddd 100644
--- a/packages/unpublished-serializer-encapsulation-test-app/package.json
+++ b/packages/unpublished-serializer-encapsulation-test-app/package.json
@@ -22,10 +22,10 @@
     "@ember-data/model": "4.1.0-alpha.11",
     "@ember-data/record-data": "4.1.0-alpha.11",
     "@ember-data/store": "4.1.0-alpha.11",
+    "@ember-data/unpublished-test-infra": "4.1.0-alpha.11",
     "ember-inflector": "^4.0.1"
   },
   "devDependencies": {
-    "@ember-data/unpublished-test-infra": "4.1.0-alpha.11",
     "@ember/optional-features": "^2.0.0",
     "@ember/test-helpers": "^2.2.5",
     "broccoli-asset-rev": "^3.0.0",
diff --git a/packages/unpublished-test-infra/browserlist.js b/packages/unpublished-test-infra/browserlist.js
new file mode 100644
index 00000000000..b0d01dca4b1
--- /dev/null
+++ b/packages/unpublished-test-infra/browserlist.js
@@ -0,0 +1,4 @@
+const modernBrowsers = ['last 1 Chrome versions', 'last 1 Firefox versions', 'last 1 Safari versions'];
+const allSupportedBrowsers = ['last 2 Chrome versions', 'last 2 Firefox versions', 'Safari 12', 'last 2 Edge versions'];
+
+export { modernBrowsers, allSupportedBrowsers };
\ No newline at end of file