diff --git a/.gitignore b/.gitignore
index 5945112bf9..76029a04f2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,7 +13,6 @@ stats/
 zerver/fixtures/available-migrations
 zerver/fixtures/migration-status
 zerver/fixtures/test_data1.json
-frontend_tests/test_credentials.js
 .kdev4
 zulip.kdev4
 memcached_prefix
diff --git a/frontend_tests/casper_tests/.gitignore b/frontend_tests/casper_tests/.gitignore
index a7081b185f..d887e75259 100644
--- a/frontend_tests/casper_tests/.gitignore
+++ b/frontend_tests/casper_tests/.gitignore
@@ -1 +1,2 @@
 /server.log
+/test_credentials.js
diff --git a/frontend_tests/casper_tests/05-settings.js b/frontend_tests/casper_tests/05-settings.js
index bfb5096a9d..7ec12c140a 100644
--- a/frontend_tests/casper_tests/05-settings.js
+++ b/frontend_tests/casper_tests/05-settings.js
@@ -1,5 +1,5 @@
 var common = require('../common.js').common;
-var test_credentials = require('../test_credentials.js').test_credentials;
+var test_credentials = require('./test_credentials.js').test_credentials;
 
 common.start_and_log_in();
 
diff --git a/tools/generate-test-credentials b/tools/generate-test-credentials
index 60741cf464..5c39cf62ab 100755
--- a/tools/generate-test-credentials
+++ b/tools/generate-test-credentials
@@ -5,7 +5,7 @@ cd "$(dirname "$0")"/..
 email=iago@zulip.com
 
 password=$(python manage.py print_initial_password "$email" | fgrep "$email" | awk '{ print $2 }')
-cat > frontend_tests/test_credentials.js <<EOF
+cat > frontend_tests/casper_tests/test_credentials.js <<EOF
 // Generated by tools/generate-test-credentials
 var test_credentials = {default_user: {username: 'iago@zulip.com', password: '$password'}};
 try { exports.test_credentials = test_credentials; } catch (e) {}