diff --git a/.babelrc b/.babelrc
index 3c9affd9bbf..bdac2bb7ee8 100644
--- a/.babelrc
+++ b/.babelrc
@@ -9,7 +9,6 @@
     "stage-3"
   ],
   "plugins": [
-    "babel-plugin-rewire",
     "inline-react-svg",
     "transform-runtime",
     ["module-resolver", {
@@ -20,10 +19,16 @@
   "env": {
     "development": {
       "plugins": [
-        ["styled-components", {
-          "ssr": true
+        ["babel-plugin-styled-components", {
+          "ssr": true,
+          "displayName": true
         }]
       ]
+    },
+    "test" : {
+      "plugins": [
+        "babel-plugin-rewire"
+      ]
     }
   }
 }
diff --git a/desktop/apps/webpack/components/App.js b/desktop/apps/webpack/components/App.js
index 8761f1984b4..38a0d9ed3c9 100644
--- a/desktop/apps/webpack/components/App.js
+++ b/desktop/apps/webpack/components/App.js
@@ -7,8 +7,6 @@ const Container = styled.div`
   color: white;
 `
 
-Container.displayName = 'Container'
-
 export class App extends Component {
   render () {
     return (
diff --git a/mobile/apps/galleries_institutions/client/galleries_institutions.coffee b/mobile/apps/galleries_institutions/client/galleries_institutions.coffee
index b0b12a93460..736eb71fa10 100644
--- a/mobile/apps/galleries_institutions/client/galleries_institutions.coffee
+++ b/mobile/apps/galleries_institutions/client/galleries_institutions.coffee
@@ -1,5 +1,3 @@
-# require 'waypoints/lib/jquery.waypoints.js'
-# require 'jquery-waypoints/waypoints.js'
 require '../../../../node_modules/waypoints/lib/jquery.waypoints.js'
 
 { CITY, PARTNERS } = require('sharify').data
diff --git a/test/test.config.js b/test/test.config.js
index 68b09a9fa19..969e8d9ce4d 100644
--- a/test/test.config.js
+++ b/test/test.config.js
@@ -1,4 +1,11 @@
+const path = require('path')
+
 require('raf/polyfill')
+
+require('dotenv').config({
+  path: path.join(process.cwd(), '.env.test')
+})
+
 const Adapter = require('enzyme-adapter-react-16')
 const Enzyme = require('enzyme')