diff --git a/aio/.angular-cli.json b/aio/.angular-cli.json
index 441dddf80c..8e6e6f240a 100644
--- a/aio/.angular-cli.json
+++ b/aio/.angular-cli.json
@@ -39,7 +39,7 @@
   ],
   "e2e": {
     "protractor": {
-      "config": "./protractor.conf.js"
+      "config": "tests/e2e/protractor.conf.js"
     }
   },
   "lint": [
@@ -50,12 +50,12 @@
       "project": "src/tsconfig.spec.json"
     },
     {
-      "project": "e2e/tsconfig.e2e.json"
+      "project": "tests/e2e/tsconfig.e2e.json"
     }
   ],
   "test": {
     "karma": {
-      "config": "./karma.conf.js"
+      "config": "src/karma.conf.js"
     }
   },
   "defaults": {
diff --git a/aio/karma.conf.js b/aio/src/karma.conf.js
similarity index 100%
rename from aio/karma.conf.js
rename to aio/src/karma.conf.js
diff --git a/aio/e2e/api.e2e-spec.ts b/aio/tests/e2e/api.e2e-spec.ts
similarity index 100%
rename from aio/e2e/api.e2e-spec.ts
rename to aio/tests/e2e/api.e2e-spec.ts
diff --git a/aio/e2e/api.po.ts b/aio/tests/e2e/api.po.ts
similarity index 100%
rename from aio/e2e/api.po.ts
rename to aio/tests/e2e/api.po.ts
diff --git a/aio/e2e/app.e2e-spec.ts b/aio/tests/e2e/app.e2e-spec.ts
similarity index 100%
rename from aio/e2e/app.e2e-spec.ts
rename to aio/tests/e2e/app.e2e-spec.ts
diff --git a/aio/e2e/app.po.ts b/aio/tests/e2e/app.po.ts
similarity index 100%
rename from aio/e2e/app.po.ts
rename to aio/tests/e2e/app.po.ts
diff --git a/aio/protractor.conf.js b/aio/tests/e2e/protractor.conf.js
similarity index 92%
rename from aio/protractor.conf.js
rename to aio/tests/e2e/protractor.conf.js
index d112804b62..2fbf107c8f 100644
--- a/aio/protractor.conf.js
+++ b/aio/tests/e2e/protractor.conf.js
@@ -6,7 +6,7 @@ const { SpecReporter } = require('jasmine-spec-reporter');
 exports.config = {
   allScriptsTimeout: 11000,
   specs: [
-    './e2e/**/*.e2e-spec.ts'
+    './*.e2e-spec.ts'
   ],
   capabilities: {
     browserName: 'chrome',
@@ -26,7 +26,7 @@ exports.config = {
   },
   beforeLaunch: function() {
     require('ts-node').register({
-      project: 'e2e/tsconfig.e2e.json'
+      project: 'tests/e2e/tsconfig.e2e.json'
     });
   },
   onPrepare() {
diff --git a/aio/e2e/tsconfig.e2e.json b/aio/tests/e2e/tsconfig.e2e.json
similarity index 70%
rename from aio/e2e/tsconfig.e2e.json
rename to aio/tests/e2e/tsconfig.e2e.json
index 1d9e5edf09..3e5bb16361 100644
--- a/aio/e2e/tsconfig.e2e.json
+++ b/aio/tests/e2e/tsconfig.e2e.json
@@ -1,7 +1,7 @@
 {
-  "extends": "../tsconfig.json",
+  "extends": "../../tsconfig.json",
   "compilerOptions": {
-    "outDir": "../out-tsc/e2e",
+    "outDir": "../../out-tsc/e2e",
     "baseUrl": "./",
     "module": "commonjs",
     "target": "es5",