diff --git a/fabfile.py b/fabfile.py
index ca990981989172da52204f03d02003d94352dfad..7da34f3d9727fd9990c4b94e9aaf3a351b8ccb99 100644
--- a/fabfile.py
+++ b/fabfile.py
@@ -32,7 +32,7 @@ def regenerate():
     local('pelican -r -s pelicanconf.py')
 
 def serve():
-    local('cd {deploy_path} && python -m SimpleHTTPServer'.format(**env))
+    local('cd {deploy_path} && python -m SimpleHTTPServer 8080'.format(**env))
 
 def reserve():
     build()
diff --git a/tox.ini b/tox.ini
index b78fa5110a47173dfa4bc06371efedef486dbf38..99568021004b145a86acdc7020b9b4257447f8c7 100644
--- a/tox.ini
+++ b/tox.ini
@@ -10,10 +10,9 @@ deps =
     pelican
 commands =
     build: fab build
-    serve: fab build serve
-    publish: fab publish
-    publish: git push
+    serve: fab reserve
+    publish:
+        fab publish
+        git push
 whitelist_externals =
-    ssh
-    rsync
     git