diff --git a/.travis.yml b/.travis.yml
index fd486b8..e2b03e3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,11 +1,19 @@
 language: objective-c
-osx_image: xcode7.3
+osx_image: xcode8.3
 
 xcode_project: PassiveDataKit.xcodeproj 
 xcode_scheme: PassiveDataKit
-xcode_sdk: iphonesimulator9.3
+xcode_sdk: iphonesimulator10.2
+
+before_install:
+ - brew cask uninstall oclint
+ - brew tap oclint/formulae
+ - brew install oclint
 
 script:
- - xctool -scheme PassiveDataKit -project PassiveDataKit.xcodeproj -sdk iphonesimulator9.3 ARCHS=i386 VALID_ARCHS=i386  CURRENT_ARCH=i386 ONLY_ACTIVE_ARCH=NO -reporter json-compilation-database:compile_commands.json build 
- - xcodebuild test -scheme PassiveDataKitTests -project PassiveDataKit.xcodeproj -destination 'platform=iOS Simulator,name=iPhone 6,OS=9.3'
- - oclint-json-compilation-database -e AFNetworking -e mixpanel-iphone
+ -  xcodebuild test -list -project 'PassiveDataKit.xcodeproj'
+ - set -o pipefail && travis_retry xcodebuild test -scheme 'PassiveDataKit' -project 'PassiveDataKit.xcodeproj' -destination 'platform=iOS Simulator,name=iPhone 6s,OS=10.2'
+ - xcodebuild -project 'PassiveDataKit.xcodeproj' | tee xcodebuild.log
+ - oclint-xcodebuild
+ - oclint-json-compilation-database
+