diff --git a/.cirrus.yml b/.cirrus.yml
index 174e2498..83246da2 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -1,8 +1,7 @@
 task:
   freebsd_instance:
     matrix:
-      #image: freebsd-11-2-release-amd64
-      image: freebsd-12-0-release-amd64
+      image: freebsd-12-1-release-amd64
   pip_cache:
     folder: ~/.cache/pip
     fingerprint_script: cat requirements*
diff --git a/.travis.yml b/.travis.yml
index df24de67..3606e167 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,6 @@
 language: python
 python:
-  - "3.6"
+  - "3.7"
 sudo: false
 env:
   - MYPYPATH="$TRAVIS_BUILD_DIR/.travis/mypy-stubs"
diff --git a/Makefile b/Makefile
index d4e97c94..868014bb 100644
--- a/Makefile
+++ b/Makefile
@@ -3,8 +3,9 @@ JAIL_NIC?=vtnet0
 JAIL_IP?=172.16.0
 JAIL_NET?=16
 MYPYPATH = $(shell pwd)/.travis/mypy-stubs
-PYTHON ?= python3.6
+PYTHON ?= python3.7
 
+# turn python3.7 -> 3.7 -> 37
 pyver= ${PYTHON:S/^python//:S/.//:C/\([0-9]+\)/\1/}
 
 .if $(pyver) < 35
@@ -19,9 +20,9 @@ install-python-requirements:
 install-python-requirements-dev: install-python-requirements
 	$(PYTHON) -m pip install -Ur requirements-dev.txt
 install-deps:
-	pkg install -q -y libucl py$(pyver)-ucl py$(pyver)-cython rsync python$(pyver) py$(pyver)-libzfs
+	pkg install -q -y libucl py$(pyver)-ucl py$(pyver)-setuptools py$(pyver)-wheel rsync python$(pyver) py$(pyver)-libzfs
 install-deps-dev: install-deps
-	if [ "`uname`" = "FreeBSD" ]; then pkg install -y gmake py36-sqlite3; fi
+	if [ "`uname`" = "FreeBSD" ]; then pkg install -y gmake py$(pyver)-sqlite3; fi
 install-dev: install-deps-dev install-python-requirements-dev
 	$(PYTHON) -m pip install -e .
 install-travis:
diff --git a/setup.cfg b/setup.cfg
index 57b59a67..f7fa6d93 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -2,7 +2,7 @@
 description-file = README.md
 
 [mypy]
-python_version = 3.6
+python_version = 3.7
 # override flake8-mypy defaults, since we provide (missing) types
 platform='freebsd'