diff --git a/tools/test-all b/tools/test-all
index af6b2b8c57..7c783f4dd9 100755
--- a/tools/test-all
+++ b/tools/test-all
@@ -17,6 +17,6 @@ run ./tools/clean-repo
 run ./tools/check-all
 run ./tools/test-js-with-node
 run ./tools/test-backend
-run ./zerver/tests/frontend/run
+run ./tools/test-js-with-casper
 
 printf '\n\e[32mAll OK!\e[0m\n'
diff --git a/tools/test-js-with-casper b/tools/test-js-with-casper
new file mode 120000
index 0000000000..43ad3c099f
--- /dev/null
+++ b/tools/test-js-with-casper
@@ -0,0 +1 @@
+../zerver/tests/frontend/run
\ No newline at end of file
diff --git a/zerver/tests/frontend/run b/zerver/tests/frontend/run
index c60a5f5af3..c3e3610068 100755
--- a/zerver/tests/frontend/run
+++ b/zerver/tests/frontend/run
@@ -34,7 +34,7 @@ for file in args:
         file = path.join(path.dirname(__file__), 'tests', file)
     test_files.append(path.abspath(file))
 
-os.chdir(path.join(path.dirname(__file__), '../../..'))
+os.chdir(path.join(path.dirname(path.realpath(__file__)), '../../..'))
 
 subprocess.check_call('tools/generate-fixtures')