diff --git a/spec/chatbox.js b/spec/chatbox.js
index b7e6a6c4b..ca9b5c7b8 100644
--- a/spec/chatbox.js
+++ b/spec/chatbox.js
@@ -1,6 +1,6 @@
 (function (root, factory) {
     define([
-        "jquery.noconflict",
+        "jquery",
         "jasmine",
         "utils",
         "converse-core",
diff --git a/spec/chatroom.js b/spec/chatroom.js
index eb8df2bab..1839ba851 100644
--- a/spec/chatroom.js
+++ b/spec/chatroom.js
@@ -1,5 +1,5 @@
 (function (root, factory) {
-    define(["jquery.noconflict", "jasmine", "mock", "converse-core", "test-utils", "utils" ], factory);
+    define(["jquery", "jasmine", "mock", "converse-core", "test-utils", "utils" ], factory);
 } (this, function ($, jasmine, mock, converse, test_utils, utils) {
     var _ = converse.env._;
     var $pres = converse.env.$pres;
diff --git a/spec/controlbox.js b/spec/controlbox.js
index dcd2befd3..c8b654666 100644
--- a/spec/controlbox.js
+++ b/spec/controlbox.js
@@ -1,5 +1,5 @@
 (function (root, factory) {
-    define(["jquery.noconflict", "jasmine", "mock", "converse-core", "test-utils"], factory);
+    define(["jquery", "jasmine", "mock", "converse-core", "test-utils"], factory);
 } (this, function ($, jasmine, mock, converse, test_utils) {
     var _ = converse.env._;
     var $pres = converse.env.$pres;
diff --git a/spec/converse.js b/spec/converse.js
index 33350d7df..757fb2007 100644
--- a/spec/converse.js
+++ b/spec/converse.js
@@ -1,6 +1,6 @@
 (function (root, factory) {
     define([
-        "jquery.noconflict",
+        "jquery",
         "jasmine",
         "converse-core",
         "mock",
diff --git a/spec/mam.js b/spec/mam.js
index d0e916f1c..57da6b41b 100644
--- a/spec/mam.js
+++ b/spec/mam.js
@@ -1,5 +1,5 @@
 (function (root, factory) {
-    define(["jquery.noconflict", "jasmine", "mock", "converse-core", "test-utils"], factory);
+    define(["jquery", "jasmine", "mock", "converse-core", "test-utils"], factory);
 } (this, function ($, jasmine, mock, converse, test_utils) {
     "use strict";
     var _ = converse.env._;
diff --git a/spec/minchats.js b/spec/minchats.js
index f698d2f46..e698b24fc 100644
--- a/spec/minchats.js
+++ b/spec/minchats.js
@@ -1,5 +1,5 @@
 (function (root, factory) {
-    define(["jquery.noconflict", "jasmine", "mock", "converse-core", "test-utils"], factory);
+    define(["jquery", "jasmine", "mock", "converse-core", "test-utils"], factory);
 } (this, function ($, jasmine, mock, converse, test_utils) {
     var _ = converse.env._;
     var $msg = converse.env.$msg;
diff --git a/spec/notification.js b/spec/notification.js
index 0c2ea96aa..3fdce2044 100644
--- a/spec/notification.js
+++ b/spec/notification.js
@@ -1,5 +1,5 @@
 (function (root, factory) {
-    define(["jquery.noconflict", "jasmine", "mock", "converse-core", "test-utils", "utils"], factory);
+    define(["jquery", "jasmine", "mock", "converse-core", "test-utils", "utils"], factory);
 } (this, function ($, jasmine, mock, converse, test_utils, utils) {
     "use strict";
     var _ = converse.env._;
diff --git a/spec/otr.js b/spec/otr.js
index 649ae4613..7622b71ac 100644
--- a/spec/otr.js
+++ b/spec/otr.js
@@ -1,5 +1,5 @@
 (function (root, factory) {
-    define(["jquery.noconflict", "jasmine", "mock", "converse-core", "test-utils"], factory);
+    define(["jquery", "jasmine", "mock", "converse-core", "test-utils"], factory);
 } (this, function ($, jasmine, mock, converse, test_utils) {
     var Strophe = converse.env.Strophe;
     var b64_sha1 = converse.env.b64_sha1;
diff --git a/spec/register.js b/spec/register.js
index e24f6f9b2..995f7b6cd 100644
--- a/spec/register.js
+++ b/spec/register.js
@@ -1,5 +1,5 @@
 (function (root, factory) {
-    define(["jquery.noconflict", "jasmine", "mock", "converse-core", "test-utils"], factory);
+    define(["jquery", "jasmine", "mock", "converse-core", "test-utils"], factory);
 } (this, function ($, jasmine, mock, converse, test_utils) {
     var Strophe = converse.env.Strophe;
     var $iq = converse.env.$iq;
diff --git a/spec/roster.js b/spec/roster.js
index 4aaecfb1d..2f07ad306 100644
--- a/spec/roster.js
+++ b/spec/roster.js
@@ -1,5 +1,5 @@
 (function (root, factory) {
-    define(["jquery.noconflict", "jasmine", "mock", "converse-core", "test-utils"], factory);
+    define(["jquery", "jasmine", "mock", "converse-core", "test-utils"], factory);
 } (this, function ($, jasmine, mock, converse, test_utils) {
     var _ = converse.env._;
     var $pres = converse.env.$pres;
diff --git a/spec/transcripts.js b/spec/transcripts.js
index e9ad7b2cd..d1a5f28dc 100644
--- a/spec/transcripts.js
+++ b/spec/transcripts.js
@@ -1,6 +1,6 @@
 (function (root, factory) {
     define([
-        "jquery.noconflict",
+        "jquery",
         "converse-core",
         "mock",
         "test_utils",
diff --git a/spec/xmppstatus.js b/spec/xmppstatus.js
index 2587dfebc..b3c523ba5 100644
--- a/spec/xmppstatus.js
+++ b/spec/xmppstatus.js
@@ -1,5 +1,5 @@
 (function (root, factory) {
-    define(["jquery.noconflict", "jasmine", "mock", "converse-core", "test-utils"], factory);
+    define(["jquery", "jasmine", "mock", "converse-core", "test-utils"], factory);
 } (this, function ($, jasmine, mock, converse, test_utils) {
 
     return describe("The XMPPStatus model", function() {
diff --git a/src/build-no-dependencies.js b/src/build-no-dependencies.js
index 3066ff33e..5ab30af29 100644
--- a/src/build-no-dependencies.js
+++ b/src/build-no-dependencies.js
@@ -5,8 +5,6 @@
     include: ["converse"],
     exclude: [
         "awesomplete",
-        "jquery",
-        "jquery.noconflict",
         "backbone.browserStorage",
         "backbone.overview",
         "moment",
diff --git a/src/config.js b/src/config.js
index 1808ed751..e811b3c5d 100644
--- a/src/config.js
+++ b/src/config.js
@@ -31,9 +31,7 @@ require.config({
         "form-utils":               "src/form-utils",
         "i18n":                     "src/i18n",
         "jed":                      "node_modules/jed/jed",
-        "jquery":                   "node_modules/jquery/dist/jquery",
         "jquery.browser":           "node_modules/jquery.browser/dist/jquery.browser",
-        "jquery.noconflict":        "src/jquery.noconflict",
         "lodash":                   "node_modules/lodash/lodash",
         "lodash.converter":         "3rdparty/lodash.fp",
         "lodash.fp":                "src/lodash.fp",
@@ -106,7 +104,6 @@ require.config({
         // '*' means all modules will get the '*.noconflict' version
         // as their dependency.
         '*': {
-            'jquery': 'jquery.noconflict',
             'backbone': 'backbone.noconflict',
             'lodash': 'lodash.noconflict'
          },
@@ -114,7 +111,6 @@ require.config({
         // If this line was not here, there would
         // be an unresolvable cyclic dependency.
         'backbone.noconflict': { 'backbone': 'backbone' },
-        'jquery.noconflict': { 'jquery': 'jquery' },
         'lodash.noconflict': { 'lodash': 'lodash' }
     },
 
diff --git a/src/jquery-stub.js b/src/jquery-stub.js
new file mode 100644
index 000000000..ae0903eac
--- /dev/null
+++ b/src/jquery-stub.js
@@ -0,0 +1,4 @@
+/*global define */
+define([], function () {
+    return Object;
+});
diff --git a/tests/mock.js b/tests/mock.js
index dcabbf9dd..9a0b04b12 100644
--- a/tests/mock.js
+++ b/tests/mock.js
@@ -1,6 +1,6 @@
 (function (root, factory) {
-    define("mock", ['jquery.noconflict', 'converse'], factory);
-}(this, function ($, converse) {
+    define("mock", ['converse'], factory);
+}(this, function (converse) {
     var _ = converse.env._;
     var Promise = converse.env.Promise;
     var Strophe = converse.env.Strophe;
@@ -115,7 +115,6 @@
         }, settings || {}));
         _converse.ChatBoxViews.prototype.trimChat = function () {};
         window.converse_disable_effects = true;
-        $.fx.off = true;
         return _converse;
     }
 
diff --git a/tests/runner.js b/tests/runner.js
index a47ac8f3c..9ab70d2d3 100644
--- a/tests/runner.js
+++ b/tests/runner.js
@@ -1,6 +1,7 @@
 /*global config */
 
 // Extra test dependencies
+config.paths.jquery = "node_modules/jquery/dist/jquery";
 config.paths.mock = "tests/mock";
 config.paths['wait-until-promise'] = "node_modules/wait-until-promise/index";
 config.paths['test-utils'] = "tests/utils";
@@ -57,7 +58,7 @@ var specs = [
 require(['console-reporter', 'mock', 'sinon', 'wait-until-promise', 'pluggable'],
         function(ConsoleReporter, mock, sinon, waitUntilPromise, pluggable) {
     window.sinon = sinon;
-    window.waitUntilPromise = waitUntilPromise['default'];
+    window.waitUntilPromise = waitUntilPromise.default;
     window.localStorage.clear();
     window.sessionStorage.clear();
     // Load the specs
diff --git a/tests/utils.js b/tests/utils.js
index 1fac97080..36e55507f 100644
--- a/tests/utils.js
+++ b/tests/utils.js
@@ -1,6 +1,6 @@
 (function (root, factory) {
-    define(['jquery.noconflict', 'converse', 'es6-promise',  'mock', 'wait-until-promise'], factory);
-}(this, function ($, converse_api, Promise, mock, waitUntilPromise) {
+    define(['converse', 'es6-promise',  'mock', 'wait-until-promise'], factory);
+}(this, function (converse_api, Promise, mock, waitUntilPromise) {
     var _ = converse_api.env._;
     var $msg = converse_api.env.$msg;
     var $pres = converse_api.env.$pres;
@@ -76,15 +76,13 @@
     utils.openContactsPanel = function (converse) {
         this.openControlBox(converse);
         var cbview = converse.chatboxviews.get('controlbox');
-        var $tabs = $(cbview.el).find('#controlbox-tabs');
-        $tabs.find('li').first().find('a')[0].click();
+        cbview.el.querySelector('#controlbox-tabs li:first-child a').click();
     };
 
     utils.openRoomsPanel = function (converse) {
         utils.openControlBox();
         var cbview = converse.chatboxviews.get('controlbox');
-        var $tabs = $(cbview.el).find('#controlbox-tabs');
-        $tabs.find('li').last().find('a')[0].click();
+        cbview.el.querySelector('#controlbox-tabs li:last-child a').click();
     };
 
     utils.openChatBoxes = function (converse, amount) {
@@ -170,7 +168,7 @@
 
     utils.clearChatBoxMessages = function (converse, jid) {
         var view = converse.chatboxviews.get(jid);
-        $(view.el).find('.chat-content').empty();
+        view.el.querySelector('.chat-content').innerHTML = '';
         view.model.messages.reset();
         view.model.messages.browserStorage._clear();
     };