diff --git a/test/app-with-appname.js b/test/app-with-appname.js
new file mode 100644
index 000000000..7343488d7
--- /dev/null
+++ b/test/app-with-appname.js
@@ -0,0 +1,59 @@
+'use strict';
+
+var path = require('path');
+var helpers = require('yeoman-test');
+var assert = require('yeoman-assert');
+
+
+describe('angular:app appName', function () {
+  beforeEach(function (done) {
+    helpers
+      .run(require.resolve('../app'))
+      .withGenerators([
+        require.resolve('../common'),
+        require.resolve('../controller'),
+        require.resolve('../main'),
+        [helpers.createDummyGenerator(), 'karma:app']
+      ])
+      .withOptions({
+        'appPath': 'app',
+        'skip-welcome-message': true,
+        'skip-message': true
+      })
+      .withArguments(['upperCaseBug'])
+      .withPrompts({
+        compass: true,
+        bootstrap: true,
+        compassBootstrap: true,
+        modules: []
+      })
+      .on('end', done);
+  });
+
+  it('generates the same appName in every file', function () {
+    assert.file([
+      'app/scripts/app.js',
+      'app/scripts/controllers/main.js',
+      'app/index.html',
+      'test/spec/controllers/main.js'
+    ]);
+
+    assert.fileContent(
+      'app/scripts/app.js',
+      /module\('upperCaseBugApp'/
+    );
+    assert.fileContent(
+      'app/scripts/controllers/main.js',
+      /module\('upperCaseBugApp'/
+    );
+    assert.fileContent(
+      'test/spec/controllers/main.js',
+      /module\('upperCaseBugApp'/
+    );
+
+    assert.fileContent(
+      'app/index.html',
+      /ng-app="upperCaseBugApp"/
+    );
+  });
+});
diff --git a/test/test-route-creation.js b/test/route.js
similarity index 100%
rename from test/test-route-creation.js
rename to test/route.js
diff --git a/test/test-appname-substitution.js b/test/test-appname-substitution.js
deleted file mode 100644
index e4212cbe0..000000000
--- a/test/test-appname-substitution.js
+++ /dev/null
@@ -1,72 +0,0 @@
-'use strict';
-
-var path = require('path');
-var helpers = require('yeoman-generator').test;
-var assert = require('yeoman-assert');
-
-
-describe('Angular generator template', function () {
-  var angular;
-  var appName = 'upperCaseBug';
-
-  beforeEach(function (done) {
-    var deps = [
-      '../../../app',
-      '../../../common',
-      '../../../controller',
-      '../../../main',
-      [ helpers.createDummyGenerator(), 'karma:app' ]
-    ];
-    helpers.testDirectory(path.join(__dirname, 'tmp', appName), function (err) {
-      if (err) {
-        done(err);
-      }
-
-      angular = helpers.createGenerator('angular:app', deps, [appName], {
-        'appPath': 'app',
-        'skip-welcome-message': true,
-        'skip-install': true,
-        'skip-message': true
-      });
-
-      helpers.mockPrompt(angular, {
-        compass: true,
-        bootstrap: true,
-        compassBootstrap: true,
-        modules: []
-      });
-
-      done();
-    });
-  });
-
-  it('should generate the same appName in every file', function (done) {
-    angular.run({}, function () {
-      assert.file([
-        'app/scripts/app.js',
-        'app/scripts/controllers/main.js',
-        'app/index.html',
-        'test/spec/controllers/main.js'
-      ]);
-
-      assert.fileContent(
-        'app/scripts/app.js',
-        new RegExp('module\\(\'' + appName + 'App\'')
-      );
-      assert.fileContent(
-        'app/scripts/controllers/main.js',
-        new RegExp('module\\(\'' + appName + 'App\'')
-      );
-      assert.fileContent(
-        'test/spec/controllers/main.js',
-        new RegExp('module\\(\'' + appName + 'App\'')
-      );
-
-      assert.fileContent(
-        'app/index.html',
-        new RegExp('ng-app=\"' + appName + 'App\"')
-      );
-      done();
-    });
-  });
-});