diff --git a/.Rbuildignore b/.Rbuildignore
index 4c6260d25..50cb1cc96 100644
--- a/.Rbuildignore
+++ b/.Rbuildignore
@@ -1,3 +1,4 @@
+^\.covrignore$
 ^.*\.Rproj$
 ^\.Rproj\.user$
 ^\.travis\.yml$
diff --git a/.covrignore b/.covrignore
new file mode 100644
index 000000000..a27b3bf9b
--- /dev/null
+++ b/.covrignore
@@ -0,0 +1,2 @@
+R/deprec-*.R
+R/compat-*.R
diff --git a/.travis.yml b/.travis.yml
index 8526b792c..130d29061 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,16 +4,16 @@ language: R
 sudo: false
 cache: packages
 
-r:
-# - 3.1 # fails with S4 weirdness
-- 3.2
-- oldrel
-- release
-- devel
-
 before_script:
 - psql -c 'create database test;' -U postgres
 
-after_success:
-  - Rscript -e 'covr::codecov()'
-
+matrix:
+  include:
+  - r: devel
+  - r: release
+    after_success:
+    - Rscript -e 'covr::codecov()'
+  - r: oldrel
+  - r: 3.3
+  - r: 3.2
+# - r: 3.1  # fails with S4 weirdness
diff --git a/cran-comments.md b/cran-comments.md
index 27d06348f..c6ad25224 100644
--- a/cran-comments.md
+++ b/cran-comments.md
@@ -3,9 +3,11 @@
 This is a minor release designed to add forward compability with the next version of rlang.
 
 ## Test environments
-* OS X install: R 3.4
-* win-builder: R-devel
-* travis-ci: R 3.2, R 3.3, R 3.4, R-devel
+
+* local: darwin15.6.0-3.5.1
+* travis: 3.1, 3.2, 3.3, oldrel, release, devel
+* r-hub: windows-x86_64-devel, ubuntu-gcc-release, fedora-clang-devel
+* win-builder: windows-x86_64-devel
 
 ## R CMD check results