diff --git a/.travis.yml b/.travis.yml
index a2baa7f..e849e7e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,85 +1,77 @@
 language: objective-c
 matrix:
   include:
-    # Xcode 8: iOS 10, macOS 10.12, tvOS 10, watchOS 3
-    - osx_image: xcode8
+    # Xcode 8.3: iOS 10, macOS 10.12, tvOS 10, watchOS 3
+    - osx_image: xcode8.3
       env:
-        - TEST_SDK="iphonesimulator10.0"
-        - TEST_SCHEME="iOS"
-        - DESTINATION="OS=10.0,name=iPhone 7 Plus"
-        - TEST_ACTION="test"
-    - osx_image: xcode8
+        - SDK="iphonesimulator10.3"
+        - SCHEME="HTMLReader iOS"
+        - DESTINATION="OS=10.3,name=iPhone 7 Plus"
+        - ACTION="test"
+    - osx_image: xcode8.3
       env:
-        - TEST_SDK="macosx10.12"
-        - TEST_SCHEME="OS X"
+        - SDK="macosx10.12"
+        - SCHEME="HTMLReader OS X"
         - DESTINATION="arch=x86_64"
-        - TEST_ACTION="test"
-    - osx_image: xcode8
+        - ACTION="test"
+    - osx_image: xcode8.3
       env:
-        - TEST_SDK="appletvsimulator10.0"
-        - TEST_SCHEME="tvOS"
+        - SDK="appletvsimulator10.2"
+        - SCHEME="HTMLReader tvOS"
         - DESTINATION="OS=10.0,name=Apple TV 1080p"
-        - TEST_ACTION="test"
-    - osx_image: xcode8
+        - ACTION="test"
+    - osx_image: xcode8.3
       env:
-        - TEST_SDK="watchsimulator3.0"
-        - TEST_SCHEME="watchOS"
-        - DESTINATION="OS=3.0,name=Apple Watch - 42mm"
-        - TEST_ACTION="build"
+        - SDK="watchsimulator3.2"
+        - SCHEME="HTMLReader watchOS"
+        - DESTINATION="OS=3.2,name=Apple Watch - 42mm"
+        - ACTION="build"
     # Xcode 7.3: iOS 9, OS X 10.11, tvOS 9, watchOS 2
     - osx_image: xcode7.3
       env:
-        - TEST_SDK="iphonesimulator9.3"
-        - TEST_SCHEME="iOS"
+        - SDK="iphonesimulator9.3"
+        - SCHEME="HTMLReader iOS"
         - DESTINATION="OS=9.0,name=iPhone 5"
-        - TEST_ACTION="test"
+        - ACTION="test"
     - osx_image: xcode7.3
       env:
-        - TEST_SDK="macosx10.11"
-        - TEST_SCHEME="OS X"
+        - SDK="macosx10.11"
+        - SCHEME="HTMLReader OS X"
         - DESTINATION="arch=x86_64"
-        - TEST_ACTION="test"
+        - ACTION="test"
     - osx_image: xcode7.3
       env:
-        - TEST_SDK="appletvsimulator9.2"
-        - TEST_SCHEME="tvOS"
+        - SDK="appletvsimulator9.2"
+        - SCHEME="HTMLReader tvOS"
         - DESTINATION="OS=9.0,name=Apple TV 1080p"
-        - TEST_ACTION="test"
+        - ACTION="test"
     - osx_image: xcode7.3
       env:
-        - TEST_SDK="watchsimulator2.2"
-        - TEST_SCHEME="watchOS"
+        - SDK="watchsimulator2.2"
+        - SCHEME="HTMLReader watchOS"
         - DESTINATION="OS=2.0,name=Apple Watch - 42mm"
-        - TEST_ACTION="build"
+        - ACTION="build"
     # Xcode 6.4: iOS 8, OS X 10.10, OS X 10.9
     - osx_image: xcode6.4
       env:
-        - TEST_SDK="iphonesimulator8.4"
-        - TEST_SCHEME="iOS"
+        - SDK="iphonesimulator8.4"
+        - SCHEME="HTMLReader iOS"
         - DESTINATION="OS=8.4,name=iPhone 5s"
-        - TEST_ACTION="test"
+        - ACTION="test"
     - osx_image: xcode6.4
       env:
-        - TEST_SDK="macosx10.10"
-        - TEST_SCHEME="OS X"
+        - SDK="macosx10.10"
+        - SCHEME="HTMLReader OS X"
         - DESTINATION="arch=x86_64"
-        - TEST_ACTION="test"
+        - ACTION="test"
     - osx_image: xcode6.4
       env:
-        - TEST_SDK="macosx10.9"
-        - TEST_SCHEME="OS X"
+        - SDK="macosx10.9"
+        - SCHEME="HTMLReader OS X"
         - DESTINATION="arch=x86_64"
-        - TEST_ACTION="test"
-    # Xcode 6.1: iOS 7
-    - osx_image: beta-xcode6.1
-      env:
-        - TEST_SDK="iphonesimulator7.1"
-        - TEST_SCHEME="iOS"
-        - DESTINATION="OS=7.1,name=iPhone 4s"
-        - TEST_ACTION="test"
+        - ACTION="test"
 script:
-  - set -o pipefail
-  - xcodebuild -project HTMLReader.xcodeproj -scheme "HTMLReader $TEST_SCHEME" -sdk "$TEST_SDK" -destination "$DESTINATION" "${TEST_ACTION:-test}" | xcpretty
+  - xcodebuild -project HTMLReader.xcodeproj -scheme "$SCHEME" -configuration Release -sdk "$SDK" -destination "$DESTINATION" "$ACTION"
 notifications:
   email:
     - nolan@nolanw.ca
diff --git a/README.md b/README.md
index 4cab12b..2703a7c 100644
--- a/README.md
+++ b/README.md
@@ -104,7 +104,7 @@ There are C libraries such as [Gumbo][] or [Hubbub][], but you need to shuffle d
 
 HTMLReader continually runs [html5lib][html5lib-tests]'s tokenization and tree construction tests, ignoring the tests for `<template>` (which HTMLReader does not implement). Note that you need to check out the `HTMLReaderTests/html5lib` Git submodule in order to actually run these tests.
 
-HTMLReader is continually built and tested on iOS versions 7.1, 8.4, 9.3, and 10.0; built and tested on macOS versions 10.9, 10.10, 10.11, and 10.12; built and tested on tvOS versions 9.2 and 10.0; and built on watchOS versions 2.2 and 3.0. It should work on down to iOS 5, macOS 10.7, tvOS 9.0, and watchOS 2.0, but there is no automated testing there (it's ok to file an issue though!).
+HTMLReader is continually built and tested on iOS versions 8.4, 9.3, and 10.3; built and tested on macOS versions 10.9, 10.10, 10.11, and 10.12; built and tested on tvOS versions 9.2 and 10.2; and built on watchOS versions 2.2 and 3.2. It should work on down to iOS 5, macOS 10.7, tvOS 9.0, and watchOS 2.0, but there is no automated testing there (it's ok to file an issue though!).
 
 Given all that:  [![Build Status](https://travis-ci.org/nolanw/HTMLReader.png?branch=master)](https://travis-ci.org/nolanw/HTMLReader)