diff --git a/lib/analyze/browsertime.js b/lib/analyze/browsertime.js
index 035c2aa58..80c8429d4 100644
--- a/lib/analyze/browsertime.js
+++ b/lib/analyze/browsertime.js
@@ -10,16 +10,19 @@ var util = require('../util/util'),
   path = require('path'),
   log = require('winston'),
   Browsertime = require('browsertime'),
+  btProxy = require('browsertime/lib/proxy'),
+  browserListenerProxy = require('browsertime/lib/proxy/browserListenerProxy'),
+  browsers = require('browsertime/lib/browsers'),
   async = require('async');
 
+var p = btProxy.createProxy({url: 'http://www.sitespeed.io'});
+
 module.exports = {
   preAnalysis: function(cb) {
-    // Perform setup to be run before analysis
-    cb(null);
+    p.launchProcess(cb);
   },
   postAnalysis: function(cb) {
-    // Perform tear down to be run after analysis
-    cb(null);
+    p.stopProcess(cb);
   },
   analyze: function(urls, config, asyncDoneCallback) {
 
@@ -82,7 +85,6 @@ function runBrowsertime(args, callback) {
   var url = args.url;
   var browser = args.browser;
   var config = args.config;
-  var bt = new Browsertime();
 
   var meausurementFile = path.join(config.run.absResultDir, config.dataDir, 'browsertime', browser,
     util.getFileName(url) + '-browsertime.json');
@@ -114,6 +116,12 @@ function runBrowsertime(args, callback) {
 
   log.log('info', 'Running browsertime for ' + browser + ' ' + url);
 
+  browsers.setProxy(p);
+
+  var bt = new Browsertime(browsers);
+
+  browserListenerProxy.setup(bt, p, btConfig);
+
   bt.fetch(btConfig, function() {
     fs.readFile(meausurementFile, function(err, btData) {
       if (err) {