diff --git a/.babelrc b/.babelrc
index d71a945b42ee2f5ce98ffedd50a8f391b4d47ac1..8d1f42041c21a72e2d6bc945d149d64720addc27 100644
--- a/.babelrc
+++ b/.babelrc
@@ -1,5 +1,5 @@
 {
-  "plugins": ["transform-flow-strip-types", "transform-decorators-legacy"],
+  "plugins": ["transform-flow-strip-types", "add-react-displayname", "transform-decorators-legacy"],
   "presets": ["es2015", "stage-0", "react"],
   "env": {
     "development": {
diff --git a/frontend/test/e2e/query_builder/query_builder.spec.js b/frontend/test/e2e/query_builder/query_builder.spec.js
index b0b6d3bfee130cd1b88a2c323cd8c87e1a165f14..6e4106bd8722b4ed842020f59468a80d715e3e2a 100644
--- a/frontend/test/e2e/query_builder/query_builder.spec.js
+++ b/frontend/test/e2e/query_builder/query_builder.spec.js
@@ -41,12 +41,12 @@ describeE2E("query_builder", () => {
             // save question
             await d.select(".Header-buttonSection:first-child").wait().click();
             await d.select("#SaveQuestionModal input[name='name']").wait().sendKeys("Pivot Table");
-            await d.select("#SaveQuestionModal .Button.Button--primary").wait().click();
+            await d.select("#SaveQuestionModal .Button.Button--primary").wait().click().waitRemoved(); // wait for the modal to be removed
 
             // add to new dashboard
             await d.select("#QuestionSavedModal .Button.Button--primary").wait().click();
             await d.select("#CreateDashboardModal input[name='name']").wait().sendKeys("Main Dashboard");
-            await d.select("#CreateDashboardModal .Button.Button--primary").wait().click();
+            await d.select("#CreateDashboardModal .Button.Button--primary").wait().click().waitRemoved(); // wait for the modal to be removed
 
             // save dashboard
             await d.select(".EditHeader .Button.Button--primary").wait().click();
diff --git a/package.json b/package.json
index e7d815ed1e523be5695233c0c4daf87c15920b9c..be7de7d26273112b7ffda25646e326ebbe667da9 100644
--- a/package.json
+++ b/package.json
@@ -72,6 +72,7 @@
     "babel-core": "^6.20.0",
     "babel-eslint": "^6.1.2",
     "babel-loader": "^6.2.4",
+    "babel-plugin-add-react-displayname": "^0.0.4",
     "babel-plugin-transform-decorators-legacy": "^1.3.4",
     "babel-plugin-transform-flow-strip-types": "^6.8.0",
     "babel-preset-es2015": "^6.6.0",
@@ -120,7 +121,7 @@
     "selenium-webdriver": "^2.53.3",
     "style-loader": "^0.13.0",
     "unused-files-webpack-plugin": "^2.0.2",
-    "webchauffeur": "^1.1.0",
+    "webchauffeur": "^1.2.0",
     "webpack": "^1.12.14",
     "webpack-dev-server": "^1.14.0",
     "webpack-hot-middleware": "^2.10.0",
diff --git a/yarn.lock b/yarn.lock
index 5a5d7ebf884fc40b98eb4a979489290eca836168..32129ff29969b22d4e209b9772cbf0eabb5afc7b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -160,9 +160,9 @@ amdefine@>=0.0.4:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.0.tgz#fd17474700cb5cc9c2b709f0be9d23ce3c198c33"
 
-annotate-react-dom@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/annotate-react-dom/-/annotate-react-dom-1.0.0.tgz#446b4667620c2d071344401344747b4fd7680b6f"
+annotate-react-dom@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/annotate-react-dom/-/annotate-react-dom-1.1.0.tgz#607c14d2565198d4bf365f6f05c60a61ba939a16"
 
 ansi-escapes@^1.1.0:
   version "1.4.0"
@@ -575,6 +575,10 @@ babel-messages@^6.8.0:
   dependencies:
     babel-runtime "^6.0.0"
 
+babel-plugin-add-react-displayname@^0.0.4:
+  version "0.0.4"
+  resolved "https://registry.yarnpkg.com/babel-plugin-add-react-displayname/-/babel-plugin-add-react-displayname-0.0.4.tgz#bc2a74bcbee6e505025b3352fea85ee7bc4c6f7c"
+
 babel-plugin-check-es2015-constants@^6.3.13:
   version "6.8.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-check-es2015-constants/-/babel-plugin-check-es2015-constants-6.8.0.tgz#dbf024c32ed37bfda8dee1e76da02386a8d26fe7"
@@ -7014,11 +7018,11 @@ watchpack@^0.2.1:
     chokidar "^1.0.0"
     graceful-fs "^4.1.2"
 
-webchauffeur@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/webchauffeur/-/webchauffeur-1.1.0.tgz#b0abe64978c655472b181ff4c49752c33fdd12f7"
+webchauffeur@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/webchauffeur/-/webchauffeur-1.2.0.tgz#d03d7f38d336c2ae55099d978adabc0e75a50d6f"
   dependencies:
-    annotate-react-dom "^1.0.0"
+    annotate-react-dom "^1.1.0"
     css-to-xpath "^0.1.0"
     mz "^2.6.0"
     promise-chain-decorator "^1.2.0"