diff --git a/Makefile b/Makefile
index 5f0b0c9..2efa163 100644
--- a/Makefile
+++ b/Makefile
@@ -32,7 +32,7 @@ test: | $(TOOLS)
 	# $(ENV)/bin/nosetests -s tokenserver.tests
 	
 	# Test against a running server
-	$(ENV)/bin/pserve syncserver/tests.ini 2> /dev/null & SERVER_PID=$$!; \
+	$(ENV)/bin/gunicorn --paste syncserver/tests.ini 2> /dev/null & SERVER_PID=$$!; \
 	sleep 2; \
 	$(ENV)/bin/python -m syncstorage.tests.functional.test_storage \
 		--use-token-server http://localhost:5000/token/1.0/sync/1.5; \
@@ -43,7 +43,7 @@ $(TOOLS): | $(ENV)/COMPLETE
 
 .PHONY: serve
 serve: | $(ENV)/COMPLETE
-	$(ENV)/bin/pserve ./syncserver.ini
+	$(ENV)/bin/gunicorn --paste ./syncserver.ini
 
 .PHONY: clean
 clean:
diff --git a/syncserver.ini b/syncserver.ini
index aa7105f..7672182 100644
--- a/syncserver.ini
+++ b/syncserver.ini
@@ -1,7 +1,9 @@
 [server:main]
-use = egg:Paste#http
+use = egg:gunicorn
 host = 0.0.0.0
 port = 5000
+workers = 1
+timeout = 30
 
 [app:main]
 use = egg:syncserver
diff --git a/syncserver/tests.ini b/syncserver/tests.ini
index 50b7776..fc9ea4b 100644
--- a/syncserver/tests.ini
+++ b/syncserver/tests.ini
@@ -1,7 +1,9 @@
 [server:main]
-use = egg:Paste#http
+use = egg:gunicorn
 host = 0.0.0.0
 port = 5000
+workers = 1
+timeout = 30
 
 [app:main]
 use = egg:SyncServer