diff --git a/package.json b/package.json
index f33e8005e76f4e..9f64902a0881bf 100644
--- a/package.json
+++ b/package.json
@@ -162,13 +162,11 @@
     "postcss-loader": "2.0.6",
     "prop-types": "15.5.8",
     "proxy-from-env": "1.0.0",
-    "pui-react-overlay-trigger": "8.3.3",
-    "pui-react-tooltip": "8.3.3",
+    "pivotal-ui": "11.0.0",
     "querystring-browser": "1.0.4",
     "raw-loader": "0.5.1",
     "react": "16.0.0",
-    "react-ace": "5.2.2",
-    "react-addons-test-utils": "15.6.2",
+    "react-ace": "5.5.0",
     "react-anything-sortable": "1.7.3",
     "react-color": "2.11.7",
     "react-dom": "16.0.0",
diff --git a/src/core_plugins/input_control_vis/public/components/vis/form_row.js b/src/core_plugins/input_control_vis/public/components/vis/form_row.js
index ff2891f8687312..4747afdb787507 100644
--- a/src/core_plugins/input_control_vis/public/components/vis/form_row.js
+++ b/src/core_plugins/input_control_vis/public/components/vis/form_row.js
@@ -1,7 +1,7 @@
 import PropTypes from 'prop-types';
 import React from 'react';
-import { Tooltip } from 'pui-react-tooltip';
-import { OverlayTrigger } from 'pui-react-overlay-trigger';
+import { Tooltip } from 'pivotal-ui/react/tooltip';
+import { OverlayTrigger } from 'pivotal-ui/react/overlay-trigger';
 
 export function FormRow(props) {
   let control = props.children;
diff --git a/src/core_plugins/metrics/public/components/tooltip.js b/src/core_plugins/metrics/public/components/tooltip.js
index 7d05b6f94621f4..84521e28403721 100644
--- a/src/core_plugins/metrics/public/components/tooltip.js
+++ b/src/core_plugins/metrics/public/components/tooltip.js
@@ -1,7 +1,7 @@
 import React from 'react';
-import { Tooltip } from 'pui-react-tooltip';
 import PropTypes from 'prop-types';
-import { OverlayTrigger } from 'pui-react-overlay-trigger';
+import { Tooltip } from 'pivotal-ui/react/tooltip';
+import { OverlayTrigger } from 'pivotal-ui/react/overlay-trigger';
 
 function TooltipComponent(props) {
   const tooltip = (