diff --git a/.travis.yml b/.travis.yml
index 8d61b7f..613de30 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,11 +1,14 @@
-os: osx
-osx_image: xcode7
-
 language: objective-c
-xcode_sdk: iphonesimulator
-xcode_workspace: RMPickerViewController-Demo.xcworkspace
-xcode_scheme: RMPickerViewController-Demo
 
-before_install:
-    - gem update cocoapods
+os: osx
+osx_image: xcode8
+
+env:
+  matrix:
+# Ufortunately, the iOS 8.x simulators are not starting on travis right now
+#    - NAME='iPhone 6' OS=8.4
+    - NAME='iPhone 6' OS=9.3
+    - NAME='iPhone 6' OS=10.0
 
+script:
+    - xcodebuild test -project RMPickerViewController-Demo.xcodeproj -scheme RMPickerViewController-Demo -sdk iphonesimulator -destination "platform=iOS Simulator,name=$NAME,OS=$OS"