diff --git a/packages/xen-api/src/cli.js b/packages/xen-api/src/cli.js
index dde74bb27..93afb56f4 100755
--- a/packages/xen-api/src/cli.js
+++ b/packages/xen-api/src/cli.js
@@ -12,13 +12,11 @@ import {createClient} from './'
 
 // ===================================================================
 
-Bluebird.longStackTraces()
+// Imports utils for better stacktraces.
+import '../.mocha'
 
 import createDebug from 'debug'
 
-import sourceMapSupport from 'source-map-support'
-sourceMapSupport.install()
-
 // ===================================================================
 
 function askPassword (prompt = 'Password: ') {