diff --git a/README.rst b/README.rst
index 5583b88..967bd4d 100644
--- a/README.rst
+++ b/README.rst
@@ -14,7 +14,7 @@ Features
 - Procfile for deploying to a PaaS (e.g. Heroku)
 - nose for testing
 - A simple ``manage.py`` script.
-- Easily switch between development and production environments through the APPNAME_ENV system  variable.
+- Easily switch between development and production environments through the MYFLASKAPP_ENV system  variable.
 
 Screenshots
 -----------
diff --git a/{{cookiecutter.repo_name}}/manage.py b/{{cookiecutter.repo_name}}/manage.py
index 10acc9b..a9b19b5 100644
--- a/{{cookiecutter.repo_name}}/manage.py
+++ b/{{cookiecutter.repo_name}}/manage.py
@@ -1,9 +1,12 @@
 #!/usr/bin/env python
+import sys
+import subprocess
 from flask.ext.script import Manager, Shell, Server
 from {{ cookiecutter.repo_name }} import models
 from {{ cookiecutter.repo_name }}.main import app, db
 
 manager = Manager(app)
+TEST_CMD = "nosetests"
 
 def _make_context():
     '''Return context dict for a shell session so you can access
@@ -11,6 +14,12 @@ def _make_context():
     '''
     return {'app': app, 'db': db, 'models': models}
 
+@manager.command
+def test():
+    '''Run the tests.'''
+    status = subprocess.call(TEST_CMD, shell=True)
+    sys.exit(status)
+
 @manager.command
 def createdb():
     '''Create a database from the tables defined in models.py.'''
diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/tests/unit_tests.py b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/tests/unit_tests.py
index 5db261d..653984a 100644
--- a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/tests/unit_tests.py
+++ b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/tests/unit_tests.py
@@ -7,9 +7,9 @@ except ImportError:
     import sys
     print('nose required. Run "pip install nose".')
 
-from main import app
+from {{cookiecutter.repo_name}}.main import app
 
-class Test{{cookiecutter.project_name}}(unittest.TestCase):
+class Test{{cookiecutter.repo_name | capitalize}}(unittest.TestCase):
 
     def setUp(self):
         app.config['TESTING'] = True
@@ -25,4 +25,4 @@ def json_response(response, code=200):
     return json.loads(response.data)
 
 if __name__ == '__main__':
-    unittest.main()
\ No newline at end of file
+    unittest.main()