diff --git a/.travis.yml b/.travis.yml
index 006d1cc446..3f56fe5082 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,4 @@
-osx_image: xcode8.2
+osx_image: xcode8.3
 language: objective-c
 rvm:
 - 2.2
@@ -16,7 +16,7 @@ before_install:
 - brew update
 - brew upgrade carthage || true
 - carthage version
-- travis_wait carthage bootstrap --platform $PLATFORM
+- carthage bootstrap --platform $PLATFORM
 script:
 - bundle exec rake ci[$PLATFORM]
 after_success:
diff --git a/Charts.xcodeproj/project.pbxproj b/Charts.xcodeproj/project.pbxproj
index 5ae58cdbdd..cd1b497477 100644
--- a/Charts.xcodeproj/project.pbxproj
+++ b/Charts.xcodeproj/project.pbxproj
@@ -703,6 +703,7 @@
 				06165F2A1D8110E600722320 /* Sources */,
 				06165F2B1D8110E600722320 /* Frameworks */,
 				06165F2C1D8110E600722320 /* Resources */,
+				B6355D621EA9B71800B74B2E /* Copy Carthage Frameworks */,
 			);
 			buildRules = (
 			);
@@ -782,6 +783,21 @@
 			shellPath = /bin/sh;
 			shellScript = "exec \"${SRCROOT}/scripts/build-dependencies.sh\"\n";
 		};
+		B6355D621EA9B71800B74B2E /* Copy Carthage Frameworks */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+				FBSnapshotTestCase,
+			);
+			name = "Copy Carthage Frameworks";
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = " exec \"${SRCROOT}/scripts/copy-carthage-frameworks.sh\"";
+		};
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */
diff --git a/Charts.xcodeproj/xcshareddata/xcschemes/Charts.xcscheme b/Charts.xcodeproj/xcshareddata/xcschemes/Charts.xcscheme
index 4bac55e801..4002aea0ad 100644
--- a/Charts.xcodeproj/xcshareddata/xcschemes/Charts.xcscheme
+++ b/Charts.xcodeproj/xcshareddata/xcschemes/Charts.xcscheme
@@ -29,6 +29,16 @@
       shouldUseLaunchSchemeArgsEnv = "YES"
       codeCoverageEnabled = "YES">
       <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "06165F2D1D8110E600722320"
+               BuildableName = "ChartsTests.xctest"
+               BlueprintName = "ChartsTests"
+               ReferencedContainer = "container:Charts.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
       </Testables>
       <MacroExpansion>
          <BuildableReference
@@ -61,6 +71,13 @@
             ReferencedContainer = "container:Charts.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
+      <EnvironmentVariables>
+         <EnvironmentVariable
+            key = "FB_REFERENCE_IMAGE_DIR"
+            value = "$(SOURCE_ROOT)/Tests/ReferenceImages"
+            isEnabled = "YES">
+         </EnvironmentVariable>
+      </EnvironmentVariables>
       <AdditionalOptions>
       </AdditionalOptions>
    </LaunchAction>
diff --git a/Rakefile b/Rakefile
index 6865d65fb4..daf8b1bcb7 100644
--- a/Rakefile
+++ b/Rakefile
@@ -39,8 +39,8 @@ def devices
   {
     iOS: {
       sdk: 'iphonesimulator',
-      device: "id='22FA2149-1241-469C-BF6D-462D3837DB72'",
-      uuid: '22FA2149-1241-469C-BF6D-462D3837DB72'
+      device: "name='iPhone 7'",
+      name: 'iPhone 7'
     },
     macOS: {
       sdk: 'macosx',
@@ -49,8 +49,8 @@ def devices
     },
     tvOS: {
       sdk: 'appletvsimulator',
-      device: "id='5761D8AB-2838-4681-A528-D0949FF240C5'",
-      uuid: '5761D8AB-2838-4681-A528-D0949FF240C5'
+      device: "name='Apple TV 1080p'",
+      name: 'Apple TV 1080p'
     }
   }
 end
@@ -142,4 +142,4 @@ end
 desc 'updated the podspec on cocoapods'
 task :update_pod do 
   sh "bundle exec pod trunk push Charts.podspec --allow-warnings"
-end
\ No newline at end of file
+end
diff --git a/scripts/copy-carthage-frameworks.sh b/scripts/copy-carthage-frameworks.sh
new file mode 100755
index 0000000000..fe47804c64
--- /dev/null
+++ b/scripts/copy-carthage-frameworks.sh
@@ -0,0 +1,24 @@
+#!/bin/sh
+
+case "$PLATFORM_NAME" in
+    macosx) plat=Mac;;
+    iphone*) plat=iOS;;
+    watch*) plat=watchOS;;
+    appletv*) plat=tvOS;;
+    *) echo "error: Unknown PLATFORM_NAME: $PLATFORM_NAME"; exit 1;;
+esac
+
+for (( n = 0; n < SCRIPT_INPUT_FILE_COUNT; n++ )); do
+    VAR=SCRIPT_INPUT_FILE_$n
+    framework=$(basename "${!VAR}")
+    export SCRIPT_INPUT_FILE_$n="$SRCROOT"/Carthage/Build/$plat/"$framework".framework
+done
+
+/usr/local/bin/carthage copy-frameworks || exit
+
+for (( n = 0; n < SCRIPT_INPUT_FILE_COUNT; n++ )); do
+    VAR=SCRIPT_INPUT_FILE_$n
+    source=${!VAR}.dSYM
+    dest=${BUILT_PRODUCTS_DIR}/$(basename "$source")
+    ditto "$source" "$dest" || exit
+done
\ No newline at end of file