diff --git a/ci/__main__.py b/ci/__main__.py
index a6e04c7a8ebb0cbfb82f0fb76e65417fd8768a36..7535ee9b9cff6e9f2a68e011bd1a6e7b86ecbe54 100644
--- a/ci/__main__.py
+++ b/ci/__main__.py
@@ -2,7 +2,7 @@ import click
 from subprocess import check_call
 
 DEFAULT_PYTHON_VERSION = "2.7"
-PYTHON_VERSIONS = ["2.7", "3.6"]
+PYTHON_VERSIONS = ["2.7", "3.5"]
 
 CORE_DEPS = [
     "envisage==4.6.0-1",
@@ -76,7 +76,7 @@ def test(python_version):
 
 @cli.command(help="Run flake")
 @python_version_option
-def flake(python_version):
+def flake8(python_version):
     env_name = get_env_name(python_version)
 
     check_call(["edm", "run", "-e", env_name, "--", "flake8", "."])