diff --git a/protractor.conf.js b/protractor.conf.js
index 305bb2cd5e..32999a2233 100644
--- a/protractor.conf.js
+++ b/protractor.conf.js
@@ -14,7 +14,7 @@ exports.config = {
 
   // A base URL for your application under test. Calls to protractor.get()
   // with relative paths will be prepended with this.
-  baseUrl: 'http://localhost:3000',
+  baseUrl: 'http://localhost:3001',
 
   // Options to be passed to Jasmine-node.
   jasmineNodeOpts: {
diff --git a/test/run_tests.sh b/test/run_tests.sh
index 761dd2b72d..d9f588ea06 100755
--- a/test/run_tests.sh
+++ b/test/run_tests.sh
@@ -2,6 +2,7 @@
 # Configuration
 TEST_DB=habitrpg_test
 TEST_DB_URI="mongodb://localhost/$TEST_DB"
+TEST_SERVER_PORT=3001
 
 # Build assets
 grunt build:dev
@@ -11,7 +12,7 @@ echo "Recreating test database"
 mongo "$TEST_DB" --eval "db.dropDatabase()"
 ./node_modules/protractor/bin/webdriver-manager update
 ./node_modules/protractor/bin/webdriver-manager start > /dev/null &
-NODE_DB_URI="$TEST_DB_URI" node ./src/server.js > /dev/null &
+NODE_DB_URI="$TEST_DB_URI" PORT=$TEST_SERVER_PORT node ./src/server.js > /dev/null &
 NODE_PID=$!
 trap "kill $NODE_PID && curl http://localhost:4444/selenium-server/driver/?cmd=shutDownSeleniumServer" EXIT