diff --git a/.circleci/config.yml b/.circleci/config.yml
index 6450a6e..9f964a8 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -18,8 +18,8 @@ templates:
 
     - run: mkdir -p /tmp/artifacts/logs
     - run: npm run build
-    - run: npm run lint
-    - run: npm run lint-styles
+    - run: npm run lint-js
+    - run: npm run lint-css
     - store_artifacts:
         path: /tmp/artifacts
         destination: /artifacts
@@ -42,8 +42,8 @@ templates:
     - run: mkdir -p /tmp/artifacts/logs
     - run: npm run build
     - run: npm run profiling-build
-    - run: npm run lint
-    - run: npm run lint-styles
+    - run: npm run lint-js
+    - run: npm run lint-css
     - run: DOCKER_HOST=localhost npm test
     - run: ./node_modules/.bin/istanbul report --include /tmp/artifacts/coverage/coverage.json --dir /tmp/artifacts/coverage html lcov
     - store_artifacts:
diff --git a/config/wdio.conf.js b/config/wdio.conf.js
index 484467c..9127b11 100644
--- a/config/wdio.conf.js
+++ b/config/wdio.conf.js
@@ -118,7 +118,6 @@ exports.config = {
     // Services take over a specific job you don't want to take care of. They enhance
     // your test setup with almost no effort. Unlike plugins, they don't add new
     // commands. Instead, they hook themselves up into the test process.
-    services: ['selenium-standalone'],
     //
     // Framework you want to run your specs with.
     // The following are supported: Mocha, Jasmine, and Cucumber
diff --git a/package.json b/package.json
index 46cb183..12b02a9 100644
--- a/package.json
+++ b/package.json
@@ -10,8 +10,9 @@
     "test": "cross-env NODE_ENV=test wdio config/wdio.conf.js",
     "test-watch": "cross-env NODE_ENV=test wdio config/wdio.conf.js --watch",
     "start": "webpack-dev-server --progress --profile --colors --config config/webpack.config.js",
-    "lint": "eslint --ext js --ext jsx src test",
-    "lint-styles": "stylelint \"src/styles/*.scss\""
+    "lint-js": "eslint --ext js --ext jsx src test",
+    "lint-css": "stylelint \"src/styles/*.scss\"",
+    "lint": "npm run lint-js && npm run lint-css"
   },
   "repository": {
     "type": "git",