diff --git a/.travis.yml b/.travis.yml
index 5e39fa0..b0cb261 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,34 +15,41 @@ matrix:
       python: 3.5
     - os: linux
       python: 3.6
+    - os: linux
+      python: pypy
+    - os: linux
+      python: pypy3
     - os: linux
       python: 3.7-dev
     # Ubuntu 12.04
     - os: linux
       dist: precise
       language: generic
-      env: PY_VER=py26,py27,py33,py34,py35,py36 PY_ORIGIN=pyenv
+      env: PY_VER=py26,py27,py33,py34,py35,py36,pypy,pypy3 PY_ORIGIN=pyenv
     # Ubuntu 14.04
     - os: linux
       dist: trusty
       language: generic
-      env: PY_VER=py26,py27,py33,py34,py35,py36 PY_ORIGIN=pyenv
+      env: PY_VER=py26,py27,py33,py34,py35,py36,pypy,pypy3 PY_ORIGIN=pyenv
     # macOS 10.12 Sierra
     - os: osx
       osx_image: xcode8.3
       language: generic
-      env: PY_VER=py26,py27,py33,py34,py35,py36
+      env: PY_VER=py26,py27,py33,py34,py35,py36,pypy,pypy3
     # Mac OS X 10.11 El Capitan
     - os: osx
       osx_image: xcode7.3
       language: generic
-      env: PY_VER=py26,py27,py33,py34,py35,py36
+      env: PY_VER=py26,py27,py33,py34,py35,py36,pypy,pypy3
     # Mac OS X 10.10 Yosemite
     - os: osx
       osx_image: xcode6.4
       language: generic
-      env: PY_VER=py26,py27,py33,py34,py35,py36
+      env: PY_VER=py26,py27,py33,py34,py35,py36,pypy,pypy3
   allow_failures:
+    # PyPy3 on Travis CI is out of date
+    - python: pypy3
+    # Python nightly could fail
     - python: 3.7-dev
     - env: PY_VER=py37
     - env: PY_VER=py37/pyenv
diff --git a/test/tools/ci-linux.sh b/test/tools/ci-linux.sh
index 543b213..9453adc 100755
--- a/test/tools/ci-linux.sh
+++ b/test/tools/ci-linux.sh
@@ -5,6 +5,31 @@ CI_VERBOSE=1
 ci_err() { [ $1 -ne 0 ] && echo "err: $2" >&2 && exit 1; }
 ci_is_osx() { [ X"$(uname -s)" == X"Darwin" ]; }
 
+ci_get_pypy_ver() {
+	local _v="$1"
+	[ -z "$_v" ] && _v=$(python -V 2>&1)
+	case "$_v" in
+		pypy-*|pypy2-*|pypy3-*|pypy3.*) echo "$_v"; return 0 ;;
+		pypy|pypy2|pypy3) echo "$_v-unknown"; return 0 ;;
+	esac
+	echo "$_v" | tail -1 | grep -qi pypy
+	if [ $? -eq 0 ]; then
+		local _py_ver=$(echo "$_v" | head -1 | cut -d ' ' -sf 2)
+		local _pypy_ver=$(echo "$_v" | tail -1 | cut -d ' ' -sf 2)
+		[ -z "${_py_ver} " ] && _py_ver=2
+		[ -z "${_pypy_ver}" ] && _pypy_ver="unknown"
+		case "${_py_ver}" in
+			2*) echo "pypy-${_pypy_ver}" ;;
+			3.3*) echo "pypy3.3-${_pypy_ver}" ;;
+			3.5*) echo "pypy3.5-${_pypy_ver}" ;;
+			*) echo "pypy3-${_pypy_ver}" ;;
+		esac
+		return 0
+	else
+		return 1
+	fi
+}
+
 ci_get_py_ver() {
 	local _v
 	case "$1" in
@@ -17,39 +42,38 @@ ci_get_py_ver() {
 		py37) _v=3.7-dev ;;
 		pypy) ci_is_osx && _v=pypy2-5.7.0 || _v=pypy-portable-5.7.0 ;;
 		pypy3) ci_is_osx && _v=pypy3.3-5.5-alpha || _v=pypy3-portable-5.7.0 ;;
-		*) [ -z "$1" ] && _v=$(python -V 2>&1 | cut -d ' ' -f 2) || _v="$1" ;;
+		*)
+			[ -z "$1" ] && set -- "$(python -V 2>&1)"
+			_v=$(ci_get_pypy_ver "$1")
+			[ -z "$_v" ] && _v=$(echo "$_v" | head -1 | cut -d ' ' -sf 2)
+			;;
 	esac
 	echo "${_v}"
+	return 0
 }
 
 ci_get_py_env() {
-	if [ -z "$1" ]; then
-		set -- "$(python -V 2>&1)"
-	fi
-	case "$1" in
+	[ -z "$1" ] && set -- "$(python -V 2>&1)"
+	case "$(ci_get_pypy_ver "$1")" in
 		pypy|pypy2|pypy-*|pypy2-*) echo "pypy" ;;
 		pypy3|pypy3*) echo "pypy3" ;;
 		*)
 			local _v=$(echo "$1" | head -1 | sed -e 's/[^0-9]//g' | cut -c1-2;)
-			echo "$1" | tail -1 | grep -qi pypy
-			if [ $? -eq 0 ]; then
-				case "${_ver}" in
-					2*) echo "pypy" ;;
-					*) echo "pypy3" ;;
-				esac
-			else
-				echo "py${_v}"
-			fi
+			echo "py${_v}"
 	esac
+	return 0
 }
 
 ci_pyenv_setup() {
+	[ ${CI_VERBOSE} -gt 0 ] && echo "[ci] install pyenv"
 	rm -rf ~/.pyenv
 	git clone --depth 1 https://github.com/yyuu/pyenv.git ~/.pyenv
 	PYENV_ROOT=$HOME/.pyenv
 	PATH="$HOME/.pyenv/bin:$PATH"
 	eval "$(pyenv init -)"
-	[ ${CI_VERBOSE} -gt 0 ] && echo "[ci] $(pyenv -v)"
+	ci_err $? "failed to init pyenv"
+	[ ${CI_VERBOSE} -gt 0 ] && echo "[ci] pyenv init: $(pyenv -v 2>&1)"
+	return 0
 }
 
 ci_pyenv_install() {
@@ -62,19 +86,19 @@ ci_pyenv_install() {
 	case "${_py_env}" in
 		py37) _nocache=1 ;;
 	esac
+	[ ${CI_VERBOSE} -gt 0 ] && echo "[ci] pyenv install: ${_py_env}/${_py_ver}"
 	[ -z "${PYENV_ROOT}" ] && PYENV_ROOT="$HOME/.pyenv"
 	local _py_ver_dir="${PYENV_ROOT}/versions/${_py_ver}"
 	local _py_ver_cached_dir="${CI_PYENV_CACHE}/${_py_ver}"
 	if [ -z "${_nocache}" ]; then
 		if [ ! -d "${_py_ver_dir}" ]; then
 			if [ -d "${_py_ver_cached_dir}" ]; then
-				[ ${CI_VERBOSE} -gt 0 ] && echo "[ci] using cached pyenv ${_py_ver}"
+				[ ${CI_VERBOSE} -gt 0 ] && echo "[ci] pyenv reuse ${_py_ver}"
 				ln -s "${_py_ver_cached_dir}" "${_py_ver_dir}"
 			fi
 		fi
 	fi
 	if [ ! -d "${_py_ver_dir}" ]; then
-		[ ${CI_VERBOSE} -gt 0 ] && echo "[ci] pyenv install ${_py_ver}"
 		pyenv install -s "${_py_ver}"
 		ci_err $? "pyenv failed to install ${_py_ver}"
 		if [ -z "${_nocache}" ]; then
@@ -86,6 +110,7 @@ ci_pyenv_install() {
 		fi
 	fi
 	pyenv rehash
+	return 0
 }
 
 ci_pyenv_use() {
@@ -94,12 +119,14 @@ ci_pyenv_use() {
 	local _py_ver=$(ci_get_py_ver "$1")
 	pyenv shell "${_py_ver}"
 	ci_err $? "pyenv could not use ${_py_ver}"
-	[ ${CI_VERBOSE} -gt 0 ] && echo "[ci] using python: $(python -V 2>&1)"
+	[ ${CI_VERBOSE} -gt 0 ] && echo "[ci] pyenv using python: $(python -V 2>&1)"
+	return 0
 }
 
 ci_pip_setup() {
 	local _py_ver=$(ci_get_py_ver "$1")
 	local _py_env=$(ci_get_py_env "${_py_ver}")
+	[ ${CI_VERBOSE} -gt 0 ] && echo "[ci] install pip/venv for ${_py_env}/${_py_ver}"
 	PIPOPT=$(python -c 'import sys; print("" if hasattr(sys, "real_prefix") else "--user")')
 	if [ -z "${_py_env##py2*}" ]; then
 		curl -O https://bootstrap.pypa.io/get-pip.py
@@ -111,11 +138,13 @@ ci_pip_setup() {
 	else
 	  python -m pip install ${PIPOPT} -U pip virtualenv
 	fi
+	ci_err $? "failed to upgrade pip/venv" || return 0
 }
 
 ci_venv_setup() {
 	local _py_ver=$(ci_get_py_ver "$1")
 	local _py_env=$(ci_get_py_env "${_py_ver}")
+	[ ${CI_VERBOSE} -gt 0 ] && echo "[ci] create venv for ${_py_env}/${_py_ver}"
 	local VENV_DIR=~/.venv/${_py_ver}
 	mkdir -p -- ~/.venv
 	rm -rf -- "${VENV_DIR}"
@@ -124,6 +153,7 @@ ci_venv_setup() {
 	else
 	  python -m virtualenv "${VENV_DIR}"
 	fi
+	ci_err $? "failed to create venv" || return 0
 }
 
 ci_venv_use() {
@@ -131,7 +161,9 @@ ci_venv_use() {
 	local _py_env=$(ci_get_py_env "${_py_ver}")
 	local VENV_DIR=~/.venv/${_py_ver}
 	. "${VENV_DIR}/bin/activate"
-	[ ${CI_VERBOSE} -gt 0 ] && echo "[ci] using python: $(python -V 2>&1)"
+	ci_err $? "could not actiavte virtualenv"
+	[ ${CI_VERBOSE} -gt 0 ] && echo "[ci] venv using python: $(python -V 2>&1)"
+	return 0
 }
 
 ci_run_wrapped() {
@@ -141,8 +173,9 @@ ci_run_wrapped() {
 		local _v=$(echo "$_i" | cut -d '/' -f 1)
 		local _o=$(echo "$_i" | cut -d '/' -sf 2)
 		[ -z "${_o}" ] && _o="${PY_ORIGIN}"
-		eval "$1" "${_v}" "${_o}"
+		eval "$1" "${_v}" "${_o}" || return 1
 	done
+	return 0
 }
 
 ci_step_before_install_wrapped() {
@@ -154,12 +187,13 @@ ci_step_before_install_wrapped() {
 				ci_pyenv_setup
 				CI_PYENV_SETUP=1
 			fi
-			ci_pyenv_install "${_py_ver}"
-			ci_pyenv_use "${_py_ver}"
+			ci_pyenv_install "${_py_ver}" || return 1
+			ci_pyenv_use "${_py_ver}" || return 1
 			;;
 	esac
-	ci_pip_setup "${_py_ver}"
-	ci_venv_setup "${_py_ver}"
+	ci_pip_setup "${_py_ver}" || return 1
+	ci_venv_setup "${_py_ver}" || return 1
+	return 0
 }
 
 ci_step_before_install() {
@@ -171,24 +205,26 @@ ci_step_before_install() {
 		PY_ORIGIN=pyenv
 	fi
 	CI_PYENV_SETUP=0
-	ci_run_wrapped "ci_step_before_install_wrapped"
+	ci_run_wrapped "ci_step_before_install_wrapped" || return 1
 	if [ "${CI_PYENV_SETUP}" -eq 1 ]; then
 		pyenv shell --unset
 		[ ${CI_VERBOSE} -gt 0 ] && pyenv versions
 	fi
+	return 0
 }
 
 ci_step_install_wrapped() {
 	local _py_ver="$1"
 	ci_venv_use "${_py_ver}"
 	pip install -U tox coveralls codecov
+	ci_err $? "failed to install dependencies" || return 0
 }
 
 ci_step_script_wrapped() {
 	local _py_ver="$1"
 	local _py_ori="$2"
 	local _py_env=$(ci_get_py_env "${_py_ver}")
-	ci_venv_use "${_py_ver}"
+	ci_venv_use "${_py_ver}" || return 1
 	if [ -z "${_py_env##*py3*}" ]; then
 		if [ -z "${_py_env##*pypy3*}" ]; then
 			# NOTE: workaround for travis environment
@@ -205,12 +241,13 @@ ci_step_script_wrapped() {
 		TOXENV=${_py_env}-test,${_py_env}-lint
 	fi
 	tox -e $TOXENV,cov
+	ci_err $? "tox failed" || return 0
 }
 
 ci_step_success_wrapped() {
 	local _py_ver="$1"
 	local _py_ori="$2"
-	ci_venv_use "${_py_ver}"
+	ci_venv_use "${_py_ver}" || return 1
 	coveralls
 	codecov
 }