diff --git a/Makefile b/Makefile
index 72b2836347c..c6d937a9ba9 100644
--- a/Makefile
+++ b/Makefile
@@ -11,11 +11,11 @@ test:
 
 test-unit:
 	@echo "Unit test run starting..."
-	@time docker-compose run test tox -e unit-py27,unit-py35,pep8
+	@time docker-compose run test tox -e unit-py27,unit-py36,pep8
 
 test-integration:
 	@echo "Integration test run starting..."
-	@time docker-compose run test tox -e integration-postgres-py27,integration-postgres-py35,integration-snowflake-py27,integration-snowflake-py35,integration-bigquery-py27,integration-bigquery-py35
+	@time docker-compose run test tox -e integration-postgres-py27,integration-postgres-py36,integration-snowflake-py27,integration-snowflake-py36,integration-bigquery-py27,integration-bigquery-py36
 
 test-new:
 	@echo "Test run starting..."