diff --git a/.babelrc b/.babelrc
index 64fb86e9a..44f0cbcce 100644
--- a/.babelrc
+++ b/.babelrc
@@ -5,7 +5,7 @@
       {
         "modules": false,
         "targets": {
-          "browsers": "last 2 versions",
+          "browsers": ["last 2 versions"],
           "uglify": true
         },
         "useBuiltIns": true
@@ -29,9 +29,6 @@
   "env": {
     "test": {
       "plugins": ["transform-es2015-modules-commonjs"]
-    },
-    "development": {
-      "plugins": ["transform-es2015-modules-commonjs"]
     }
   }
 }
diff --git a/app/javascript/src/scenes/SettingsPage/scenes/profile/components/InputEnabled.jsx b/app/javascript/src/scenes/SettingsPage/scenes/profile/components/InputEnabled.jsx
index 888d24cf3..811ab9247 100644
--- a/app/javascript/src/scenes/SettingsPage/scenes/profile/components/InputEnabled.jsx
+++ b/app/javascript/src/scenes/SettingsPage/scenes/profile/components/InputEnabled.jsx
@@ -343,6 +343,7 @@ class InputEnabled extends Component {
     if (inputType === "file") {
       return (
         <FormControl
+          id="user_avatar"
           type={this.props.inputType}
           onChange={this.handleChange}
           onKeyPress={this.handleKeyPress}
diff --git a/features/support/env.rb b/features/support/env.rb
index 2e99aeed9..9c8d611ba 100644
--- a/features/support/env.rb
+++ b/features/support/env.rb
@@ -10,13 +10,20 @@ require 'capybara/poltergeist'
 require 'simplecov'
 
 Capybara.register_driver :poltergeist do |app|
-  Capybara::Poltergeist::Driver.new(app,
-                                    js_errors: true,
-                                    phantomjs: Phantomjs.path)
+  Capybara::Poltergeist::Driver.new(
+    app,
+    js_errors: true,
+    phantomjs_options: ['--ignore-ssl-errors=yes', '--ssl-protocol=any'],
+    debug: true,
+    timeout: 500,
+    phantomjs: File.absolute_path(Phantomjs.path)
+  )
 end
 
 Capybara.javascript_driver = :poltergeist
-Capybara.default_max_wait_time = 5
+
+Capybara.server_port = 3001
+
 # Capybara defaults to CSS3 selectors rather than XPath.
 # If you'd prefer to use XPath, just uncomment this line and adjust any
 # selectors in your step definitions to use the XPath syntax.