diff --git a/lib/src/commands/make/test.dart b/lib/src/commands/make/test.dart
index c7efb89..68af780 100644
--- a/lib/src/commands/make/test.dart
+++ b/lib/src/commands/make/test.dart
@@ -84,7 +84,7 @@ class TestCommand extends Command {
   String _generateTest(Pubspec pubspec, ReCase rc) {
     return '''
 import 'dart:io';
-import 'package:${pubspec.name}/${pubspec.name}.dart';
+import 'package:${pubspec.name}/${pubspec.name}.dart' as ${pubspec.name};
 import 'package:angel_framework/angel_framework.dart';
 import 'package:angel_test/angel_test.dart';
 import 'package:test/test.dart';
@@ -93,7 +93,8 @@ main() async {
   TestClient client;
 
   setUp(() async {
-    var app = await createServer();
+    var app = new Angel();
+    await app.configure(${pubspec.name}.configureServer);
     client = await connectTo(app);
   });