diff --git a/README.md b/README.md
index 2cb99153..e600ec2d 100644
--- a/README.md
+++ b/README.md
@@ -19,25 +19,29 @@ A WebClient for the OpenStack Storyboard project.
 
 **Run the test suite**
 
-* `tox -enode test`
+* `tox -egrunt test`
 
 **Run a local development server**
 
-* `tox -enode server`
+* `tox -egrunt server`
 
 **Package the distro**
 
-* `tox -enode build`
+* `tox -egrunt build`
 
 ### For development.
 
 **Create the virtualenv**
 
-* `tox -enode build`
+* `tox -egrunt build`
+
+**Run a local development server without the API**
+
+* `tox -egrunt_no_api server`
 
 **Activate the virtualenv**
 
-* `source .tox/node/bin/activate`
+* `source .tox/grunt/bin/activate`
 
 #### Within the virtual environment, you have the following options
 
diff --git a/tox.ini b/tox.ini
index 749ed95d..2f958834 100644
--- a/tox.ini
+++ b/tox.ini
@@ -13,13 +13,28 @@ setenv = VIRTUAL_ENV={envdir}
 deps = nodeenv
        http://tarballs.openstack.org/storyboard/storyboard-master.tar.gz
 
-[testenv:node]
+[testenv:venv]
+commands =
+    nodeenv -p {envdir} --node=0.10.24 || true
+    npm install -g bower@1.2.8 grunt@0.4.2 grunt-cli@0.1.11
+    npm install
+    bower install
+
+[testenv:grunt]
+commands =
+    nodeenv -p {envdir} --node=0.10.24 || true
+    npm install -g bower@1.2.8 grunt@0.4.2 grunt-cli@0.1.11
+    npm install
+    bower install
+    bash ./bin/api.sh create-db
+    bash ./bin/api.sh start
+    grunt {posargs}
+    bash ./bin/api.sh stop
+
+[testenv:grunt_no_api]
 commands =
   nodeenv -p {envdir} --node=0.10.24 || true
   npm install -g bower@1.2.8 grunt@0.4.2 grunt-cli@0.1.11
   npm install
   bower install
-  bash ./bin/api.sh create-db
-  bash ./bin/api.sh start
-  grunt {posargs}
-  bash ./bin/api.sh stop
+  grunt {posargs}
\ No newline at end of file