diff --git a/.travis.yml b/.travis.yml
index 094ad80..d81abf1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,26 +3,17 @@ matrix:
     - language: python
       python: "3.5"
       env:
-        - INFO=PythonStyleCheck
+        - INFO=PythonCodeCheck
+      before_script: make pydependencies
       script:
         - make flake8
-    - language: python
-      python: "3.5"
-      env:
-        - INFO=PythonDocStringCheck
-      script:
         - make pydocstyle
     - language: node_js
       env:
-        - INFO=JavaScriptTests
+        - INFO=JavaScriptTestAndCheck
       node_js: "7"
       script:
         - make qunit
-    - language: node_js
-      env:
-        - INFO=JavaScriptStyleCheck
-      node_js: "7"
-      script:
         - make eslint
 
 language: python
@@ -36,14 +27,10 @@ cache:
 before_script:
   - pip install tox
 env:
-- TOX_ENV=py34
 - TOX_ENV=py35
-- TOX_ENV=py36
 - TOX_ENV=coverage
 script:
 - tox -e $TOX_ENV
-
-
 # safelist
 branches:
   only:
diff --git a/Makefile b/Makefile
index e1a13fe..fcd1344 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,6 @@
 default:
-	@echo make test		run all tests
+	@echo make pydependencies		Install Python dependencies
+	@echo make test		    run all tests
 	@echo make pytest		run Python tests only. Python3.5 or higher must be installed.
 	@echo make flake8		run Python code style checker
 	@echo make pydocstyle		run Python documentation style checker
@@ -24,4 +25,9 @@ qunit:	node_modules
 eslint:	node_modules
 	npm run lint -s
 
-test:	pytest qunit flake8 pydocstyle eslint
+pydependencies: pytest-requirements.txt dev-requirements.txt    requirements.txt
+	pip install -r requirements.txt
+	pip install -r pytest-requirements.txt
+	pip install -r dev-requirements.txt
+
+test: pytest qunit flake8 pydocstyle eslint
diff --git a/tox.ini b/tox.ini
index cb68f11..80104a7 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,23 +4,11 @@
 # and then run "tox" from this directory.
 
 [tox]
-envlist = py34, py35, flake8, pydocstyle, qunit, eslint
+envlist = py35, py36
 
 [testenv]
 commands = {envpython} setup.py test --addopts -v
 
-[testenv:flake8]
-deps =
-    flake8
-commands =
-    flake8 sacredboard
-
-[testenv:pydocstyle]
-deps =
-    pydocstyle
-commands =
-    pydocstyle sacredboard
-
 # pydocstyle ignores some warnings because of the sacredboard command line help docstring
 # and because some are mutually exclusive
 
@@ -30,19 +18,4 @@ deps =
     coveralls
 commands =
     coverage run --source=sacredboard setup.py test
-    coveralls
-
-[testenv:qunit]
-whitelist_externals=
-    qunit
-    npm
-commands =
-    npm install
-    npm test
-
-[testenv:eslint]
-whitelist_externals=
-    npm
-commands =
-    npm install
-    npm run lint -s
+    coveralls
\ No newline at end of file