diff --git a/package.json b/package.json
index 2021673..cc4d428 100644
--- a/package.json
+++ b/package.json
@@ -11,7 +11,7 @@
     "dev-server": "NODE_ENV=development node devServer.js",
     "pro": "NODE_ENV=production node proServer.js",
     "selenium-server": "selenium-standalone start",
-    "test-acceptance": "cross-env BABEL_DISABLE_CACHE=1 NODE_ENV=test babel-node ./node_modules/.bin/cucumber-js test-acceptance/features -r test-acceptance/step_definitions --format pretty --strict"
+    "test-acceptance": "cross-env BABEL_DISABLE_CACHE=1 NODE_ENV=test babel-node ./node_modules/.bin/cucumber-js test/acceptance/features -r test/acceptance/step_definitions --format pretty --strict"
   },
   "repository": {
     "type": "git",
diff --git a/test-acceptance/features/add_weather_cards_in_dashboard.feature b/test/acceptance/features/add_weather_cards_in_dashboard.feature
similarity index 100%
rename from test-acceptance/features/add_weather_cards_in_dashboard.feature
rename to test/acceptance/features/add_weather_cards_in_dashboard.feature
diff --git a/test-acceptance/step_definitions/given/i_see_the_dashboard.js b/test/acceptance/step_definitions/given/i_see_the_dashboard.js
similarity index 100%
rename from test-acceptance/step_definitions/given/i_see_the_dashboard.js
rename to test/acceptance/step_definitions/given/i_see_the_dashboard.js
diff --git a/test-acceptance/step_definitions/hooks/prepare_webdriver.js b/test/acceptance/step_definitions/hooks/prepare_webdriver.js
similarity index 96%
rename from test-acceptance/step_definitions/hooks/prepare_webdriver.js
rename to test/acceptance/step_definitions/hooks/prepare_webdriver.js
index 1006db6..293c523 100644
--- a/test-acceptance/step_definitions/hooks/prepare_webdriver.js
+++ b/test/acceptance/step_definitions/hooks/prepare_webdriver.js
@@ -3,7 +3,7 @@ import * as wdio from 'webdriverio';
 module.exports = function hooks() {
 	this.Before((scenario, done) => {
 		this.world = {};
-		this.world.driver = wdio.remote( require('../../wdio.cucumber.conf') );
+		this.world.driver = wdio.remote( require('../../wdio.cucumber.conf.js') );
 		this.world.driver.init().then(()=>done()).catch(done);
 	});
 
diff --git a/test-acceptance/step_definitions/then/there_is_a_new_weather_card_with_x_title_in_the_dashboard.js b/test/acceptance/step_definitions/then/there_is_a_new_weather_card_with_x_title_in_the_dashboard.js
similarity index 100%
rename from test-acceptance/step_definitions/then/there_is_a_new_weather_card_with_x_title_in_the_dashboard.js
rename to test/acceptance/step_definitions/then/there_is_a_new_weather_card_with_x_title_in_the_dashboard.js
diff --git a/test-acceptance/step_definitions/when/i_click_x_button.js b/test/acceptance/step_definitions/when/i_click_x_button.js
similarity index 100%
rename from test-acceptance/step_definitions/when/i_click_x_button.js
rename to test/acceptance/step_definitions/when/i_click_x_button.js
diff --git a/test-acceptance/step_definitions/when/i_write_x_in_the_x_input.js b/test/acceptance/step_definitions/when/i_write_x_in_the_x_input.js
similarity index 100%
rename from test-acceptance/step_definitions/when/i_write_x_in_the_x_input.js
rename to test/acceptance/step_definitions/when/i_write_x_in_the_x_input.js
diff --git a/test-acceptance/wdio.cucumber.conf.js b/test/acceptance/wdio.cucumber.conf.js
similarity index 100%
rename from test-acceptance/wdio.cucumber.conf.js
rename to test/acceptance/wdio.cucumber.conf.js
diff --git a/test-acceptance/wdio.js b/test/acceptance/wdio.js
similarity index 100%
rename from test-acceptance/wdio.js
rename to test/acceptance/wdio.js