diff --git a/bower.json b/bower.json
index 335947713..ea792c637 100644
--- a/bower.json
+++ b/bower.json
@@ -8,7 +8,6 @@
     "bourbon": "~4.2.6",
     "crypto-js-evanvosberg": "https://github.com/evanvosberg/crypto-js.git#release-3.1.2-5",
     "fontawesome": "~4.1.0",
-    "jasmine": "https://github.com/jcbrand/jasmine.git#1_3_x",
     "sinon": "^1.17.3",
     "typeahead.js": "https://raw.githubusercontent.com/jcbrand/typeahead.js/eedfb10505dd3a20123d1fafc07c1352d83f0ab3/dist/typeahead.jquery.js"
   },
diff --git a/package.json b/package.json
index adcd4e8c0..13f82406f 100644
--- a/package.json
+++ b/package.json
@@ -57,6 +57,7 @@
     "moment": "~2.13.0",
     "npm": "^4.1.1",
     "otr": "0.2.16",
+    "jasmine": "https://github.com/jcbrand/jasmine.git#439a7f805eeaec0cabe18a8ecf7e47da1a0afa33",
     "phantom-jasmine": "0.1.8",
     "phantomjs": "~1.9.7-1",
     "pluggable.js": "https://github.com/jcbrand/pluggable.js.git#e5fc6a78dd568a120674ff7325da038d5ba9b334",
diff --git a/tests/main.js b/tests/main.js
index 73a5b98fb..12075516f 100644
--- a/tests/main.js
+++ b/tests/main.js
@@ -2,9 +2,9 @@
 config.paths.mock = "tests/mock";
 config.paths.test_utils = "tests/utils";
 config.paths.sinon = "components/sinon/lib/sinon";
-config.paths.jasmine = "components/jasmine/lib/jasmine-core/jasmine";
+config.paths.jasmine = "node_modules/jasmine-core/lib/jasmine-core/jasmine";
 config.paths.transcripts = "converse-logs/converse-logs";
-config.paths["jasmine-html"] = "components/jasmine/lib/jasmine-core/jasmine-html";
+config.paths["jasmine-html"] = "node_modules/jasmine-core/lib/jasmine-core/jasmine-html";
 config.paths["console-runner"] = "node_modules/phantom-jasmine/lib/console-runner";
 config.shim['jasmine-html'] = {
     deps: ['jasmine'],