diff --git a/.travis.yml b/.travis.yml
index f904ae0a..eb5a101e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,25 +1,30 @@
 language: objective-c
-osx_image: xcode7.1
+osx_image: xcode7.2
 
 env:
   global:
     - LANG=en_US.UTF-8
     - LC_ALL=en_US.UTF-8
+    - WORKSPACE="ObjectMapper.xcworkspace"
     - IOS_FRAMEWORK_SCHEME="ObjectMapper-iOS"
     - OSX_FRAMEWORK_SCHEME="ObjectMapper-Mac"
     - TVOS_FRAMEWORK_SCHEME="ObjectMapper-tvOS"
-    - IOS_SDK=iphonesimulator9.1
+    - WATCHOS_FRAMEWORK_SCHEME="ObjectMapper-watchOS"
+    - IOS_SDK=iphonesimulator9.2
     - OSX_SDK=macosx10.11
-    - TVOS_SDK=appletvsimulator9.0    
+    - TVOS_SDK=appletvsimulator9.1
+    - WATCHOS_SDK=watchsimulator2.1    
   matrix:
-    - DESTINATION="OS=8.1,name=iPhone 4S"       SCHEME="$IOS_FRAMEWORK_SCHEME" SDK="$IOS_SDK" 
-    - DESTINATION="OS=8.2,name=iPhone 5"        SCHEME="$IOS_FRAMEWORK_SCHEME" SDK="$IOS_SDK"
-    - DESTINATION="OS=8.3,name=iPhone 5S"       SCHEME="$IOS_FRAMEWORK_SCHEME" SDK="$IOS_SDK"
-    - DESTINATION="OS=8.4,name=iPhone 6"        SCHEME="$IOS_FRAMEWORK_SCHEME" SDK="$IOS_SDK"
-    - DESTINATION="OS=9.0,name=iPhone 6 Plus"   SCHEME="$IOS_FRAMEWORK_SCHEME" SDK="$IOS_SDK"
-    - DESTINATION="OS=9.1,name=iPhone 6 Plus"   SCHEME="$IOS_FRAMEWORK_SCHEME" SDK="$IOS_SDK"    
-    - DESTINATION="arch=x86_64"                 SCHEME="$OSX_FRAMEWORK_SCHEME" SDK="$OSX_SDK"
-    - DESTINATION="OS=9.0,name=Apple TV 1080p"  SCHEME="$TVOS_FRAMEWORK_SCHEME" SDK="$TVOS_SDK"
+    - DESTINATION="OS=8.1,name=iPhone 4S"           SCHEME="$IOS_FRAMEWORK_SCHEME"     SDK="$IOS_SDK"     RUN_TESTS="YES" 
+    - DESTINATION="OS=8.2,name=iPhone 5"            SCHEME="$IOS_FRAMEWORK_SCHEME"     SDK="$IOS_SDK"     RUN_TESTS="YES"
+    - DESTINATION="OS=8.3,name=iPhone 5S"           SCHEME="$IOS_FRAMEWORK_SCHEME"     SDK="$IOS_SDK"     RUN_TESTS="YES"
+    - DESTINATION="OS=8.4,name=iPhone 6"            SCHEME="$IOS_FRAMEWORK_SCHEME"     SDK="$IOS_SDK"     RUN_TESTS="YES"
+    - DESTINATION="OS=9.0,name=iPhone 6 Plus"       SCHEME="$IOS_FRAMEWORK_SCHEME"     SDK="$IOS_SDK"     RUN_TESTS="YES"
+    - DESTINATION="OS=9.1,name=iPhone 6S"           SCHEME="$IOS_FRAMEWORK_SCHEME"     SDK="$IOS_SDK"     RUN_TESTS="YES"
+    - DESTINATION="OS=9.2,name=iPhone 6S Plus"      SCHEME="$IOS_FRAMEWORK_SCHEME"     SDK="$IOS_SDK"     RUN_TESTS="YES"
+    - DESTINATION="arch=x86_64"                     SCHEME="$OSX_FRAMEWORK_SCHEME"     SDK="$OSX_SDK"     RUN_TESTS="YES"
+    - DESTINATION="OS=9.1,name=Apple TV 1080p"      SCHEME="$TVOS_FRAMEWORK_SCHEME"    SDK="$TVOS_SDK"    RUN_TESTS="YES"
+    - DESTINATION="OS=2.1,name=Apple Watch - 38mm"  SCHEME="$WATCHOS_FRAMEWORK_SCHEME" SDK="$WATCHOS_SDK" RUN_TESTS="NO"
 
 before_install:
   - gem install xcpretty --no-rdoc --no-ri --no-document --quiet
@@ -27,8 +32,21 @@ before_install:
 script: 
   - set -o pipefail
   - xcodebuild -version
-  - xcodebuild -workspace ObjectMapper.xcworkspace -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Debug ONLY_ACTIVE_ARCH=NO test | xcpretty -c
-  - xcodebuild -workspace ObjectMapper.xcworkspace -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Release ONLY_ACTIVE_ARCH=NO test | xcpretty -c
+  - xcodebuild -showsdks
+
+  # Build Framework in Debug and Run Tests if specified
+  - if [ $RUN_TESTS == "YES" ]; then
+      xcodebuild -workspace "$WORKSPACE" -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Debug ONLY_ACTIVE_ARCH=NO test | xcpretty -c;
+    else
+      xcodebuild -workspace "$WORKSPACE" -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Debug ONLY_ACTIVE_ARCH=NO build | xcpretty -c;
+    fi
+
+  # Build Framework in Release and Run Tests if specified
+  - if [ $RUN_TESTS == "YES" ]; then
+      xcodebuild -workspace "$WORKSPACE" -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Release ONLY_ACTIVE_ARCH=NO test | xcpretty -c;
+    else
+      xcodebuild -workspace "$WORKSPACE" -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Release ONLY_ACTIVE_ARCH=NO build | xcpretty -c;
+    fi
 
 notifications:
   email: false
\ No newline at end of file