diff --git a/bundle/bundle.source.js b/bundle/bundle.source.js
index 9124fceb253..f3d0c7ce215 100644
--- a/bundle/bundle.source.js
+++ b/bundle/bundle.source.js
@@ -1,7 +1,7 @@
 import '../static/css/drawer.css';
 import '../static/css/dropdown.css';
 import '../static/css/sgv.css';
-import '../node_modules/jquery.tipsy/src/jquery.tipsy.css';
+import '../node_modules/jquery.tooltips/css/jquery.tooltips.css';
 
 
 $ = require("jquery");
@@ -11,7 +11,7 @@ require('jquery-ui-bundle');
 window._ = require('lodash');
 window.d3 = require('d3');
 
-require('jquery.tipsy');
+require('jquery.tooltips');
 
 window.Storage = require('js-storage');
 
diff --git a/lib/client/browser-utils.js b/lib/client/browser-utils.js
index 6ce7d2461d7..fc9a983d0e0 100644
--- a/lib/client/browser-utils.js
+++ b/lib/client/browser-utils.js
@@ -7,12 +7,12 @@ function init ($) {
 
   // Tooltips can remain in the way on touch screens.
   if (!isTouch()) {
-    $('.tip').tipsy();
+    $('.tip').tooltip();
   } else {
     // Drawer info tips should be displayed on touchscreens.
-    $('#drawer').find('.tip').tipsy();
+    $('#drawer').find('.tip').tooltip();
   }
-  $.fn.tipsy.defaults = {
+  $.fn.tooltip.defaults = {
     fade: true,
     gravity: 'n',
     opacity: 0.75
diff --git a/package.json b/package.json
index c1c7573e3d2..848a6420cbe 100644
--- a/package.json
+++ b/package.json
@@ -70,9 +70,11 @@
     "file-loader": "^1.1.11",
     "flot": "^0.8.0-alpha",
     "forever": "^0.15.3",
+    "jquery": "^2.2.4",
+    "jquery-ui-bundle": "^1.12.1",
+    "jquery.tooltips": "^1.0.0",
     "jquery": "^3.3.1",
     "jquery-ui-bundle": "^1.12.1-migrate",
-    "jquery.tipsy": "^1.0.3",
     "js-storage": "^1.0.4",
     "jsonwebtoken": "^8.2.0",
     "lodash": "^4.17.5",
diff --git a/tests/admintools.test.js b/tests/admintools.test.js
index f1851010bb1..b5be4858edb 100644
--- a/tests/admintools.test.js
+++ b/tests/admintools.test.js
@@ -67,7 +67,7 @@ describe('admintools', function ( ) {
       
       self.localCookieStorage = self.localStorage = self.$.localStorage = require('./fixtures/localstorage');
 
-      self.$.fn.tipsy = function mockTipsy ( ) { };
+      self.$.fn.tooltip = function mockTooltip ( ) { };
 
       self.$.fn.dialog = function mockDialog (opts) {
         function maybeCall (name, obj) {
diff --git a/tests/fixtures/headless.js b/tests/fixtures/headless.js
index 567262ad04d..8b59b7b5dba 100644
--- a/tests/fixtures/headless.js
+++ b/tests/fixtures/headless.js
@@ -24,7 +24,7 @@ function headless (benv, binding) {
       //self.$ = require('jquery');
       //self.$.localStorage = require(localStorage);
 
-      self.$.fn.tipsy = function mockTipsy ( ) { };
+      self.$.fn.tooltip = function mockTooltip ( ) { };
 
       var indexHtml = read(htmlFile, 'utf8');
       self.$('body').html(indexHtml);
@@ -37,7 +37,7 @@ function headless (benv, binding) {
         self.$.plot = function mockPlot () {
         };
 
-        self.$.fn.tipsy = function mockTipsy ( ) { };
+        self.$.fn.tooltip = function mockTooltip ( ) { };
 
         self.$.fn.dialog = function mockDialog (opts) {
           function maybeCall (name, obj) {
diff --git a/tests/hashauth.test.js b/tests/hashauth.test.js
index 19fb50cc69e..c8b1bf50f3b 100644
--- a/tests/hashauth.test.js
+++ b/tests/hashauth.test.js
@@ -33,7 +33,7 @@ describe('hashauth', function ( ) {
       self.$ = require('jquery');
       self.$.localStorage = require('./fixtures/localstorage');
 
-      self.$.fn.tipsy = function mockTipsy ( ) { };
+      self.$.fn.tooltip = function mockTooltip ( ) { };
 
       var indexHtml = read(__dirname + '/../static/index.html', 'utf8');
       self.$('body').html(indexHtml);