diff --git a/aio/package.json b/aio/package.json
index 2cd813ae14..8e3ed744d9 100644
--- a/aio/package.json
+++ b/aio/package.json
@@ -45,7 +45,7 @@
     "docs-watch": "node tools/transforms/authors-package/watchr.js",
     "docs-lint": "eslint --ignore-path=\"tools/transforms/.eslintignore\" tools/transforms",
     "docs-test": "node tools/transforms/test.js",
-    "redirects-test": "jasmine-ts tests/deployment-config/unit/**/*.spec.ts",
+    "redirects-test": "jasmine-ts tests/deployment/unit/**/*.spec.ts",
     "firebase-utils-test": "jasmine-ts tools/firebase-test-utils/*.spec.ts",
     "tools-lint": "tslint -c \"tools/tslint.json\" \"tools/firebase-test-utils/**/*.ts\"",
     "tools-test": "./scripts/deploy-to-firebase.test.sh && yarn docs-test && yarn boilerplate:test && jasmine tools/ng-packages-installer/index.spec.js && yarn firebase-utils-test",
diff --git a/aio/scripts/test-production.sh b/aio/scripts/test-production.sh
index 71988b136a..e158d5e78d 100755
--- a/aio/scripts/test-production.sh
+++ b/aio/scripts/test-production.sh
@@ -6,11 +6,11 @@ set +x -eu -o pipefail
   readonly aioDir="$(realpath $thisDir/..)"
 
   readonly appPtorConf="$aioDir/tests/e2e/protractor.conf.js"
-  readonly cfgPtorConf="$aioDir/tests/deployment-config/e2e/protractor.conf.js"
+  readonly cfgPtorConf="$aioDir/tests/deployment/e2e/protractor.conf.js"
   readonly minPwaScore="95"
   readonly urls=(
     "https://angular.io/"
-    "https://next.angular.io"
+    "https://next.angular.io/"
   )
 
   cd "$aioDir"
diff --git a/aio/tests/deployment-config/e2e/protractor.conf.js b/aio/tests/deployment/e2e/protractor.conf.js
similarity index 100%
rename from aio/tests/deployment-config/e2e/protractor.conf.js
rename to aio/tests/deployment/e2e/protractor.conf.js
diff --git a/aio/tests/deployment-config/e2e/redirection.e2e-spec.ts b/aio/tests/deployment/e2e/redirection.e2e-spec.ts
similarity index 100%
rename from aio/tests/deployment-config/e2e/redirection.e2e-spec.ts
rename to aio/tests/deployment/e2e/redirection.e2e-spec.ts
diff --git a/aio/tests/deployment-config/shared/URLS_TO_REDIRECT.txt b/aio/tests/deployment/shared/URLS_TO_REDIRECT.txt
similarity index 100%
rename from aio/tests/deployment-config/shared/URLS_TO_REDIRECT.txt
rename to aio/tests/deployment/shared/URLS_TO_REDIRECT.txt
diff --git a/aio/tests/deployment-config/shared/helpers.ts b/aio/tests/deployment/shared/helpers.ts
similarity index 100%
rename from aio/tests/deployment-config/shared/helpers.ts
rename to aio/tests/deployment/shared/helpers.ts
diff --git a/aio/tests/deployment-config/unit/testFirebaseRedirection.spec.ts b/aio/tests/deployment/unit/testFirebaseRedirection.spec.ts
similarity index 100%
rename from aio/tests/deployment-config/unit/testFirebaseRedirection.spec.ts
rename to aio/tests/deployment/unit/testFirebaseRedirection.spec.ts
diff --git a/aio/tests/deployment-config/unit/testServiceWorkerRoutes.spec.ts b/aio/tests/deployment/unit/testServiceWorkerRoutes.spec.ts
similarity index 100%
rename from aio/tests/deployment-config/unit/testServiceWorkerRoutes.spec.ts
rename to aio/tests/deployment/unit/testServiceWorkerRoutes.spec.ts