diff --git a/.travis.yml b/.travis.yml
index 0038954..d0250d1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,7 @@
 language: objective-c
 before_install:
     - brew update
-    - brew install xctool --HEAD
+    - brew uninstall xctool && brew install https://raw.github.com/fpotter/homebrew/246a1439dab49542d4531ad7e1bac7048151f601/Library/Formula/xctool.rb
+    - gem install cocoapods -v 0.22.2
     - cd Tests && pod install && cd $TRAVIS_BUILD_DIR
 script: rake test
diff --git a/Rakefile b/Rakefile
index 9b8d7ef..f0489d2 100644
--- a/Rakefile
+++ b/Rakefile
@@ -5,16 +5,12 @@ namespace :test do
 
   desc "Run the AFNetworking Tests for iOS"
   task :ios => :prepare do
-    $ios_success = system("xctool -workspace AFNetworking.xcworkspace -scheme 'iOS Tests' build -sdk iphonesimulator -configuration Release")
-    $ios_success = system("xctool -workspace AFNetworking.xcworkspace -scheme 'iOS Tests' build-tests -sdk iphonesimulator -configuration Release")
-    $ios_success = system("xctool -workspace AFNetworking.xcworkspace -scheme 'iOS Tests' test -test-sdk iphonesimulator -configuration Release")
+    $ios_success = system("xctool -workspace AFNetworking.xcworkspace -scheme 'iOS Tests' -sdk iphonesimulator -configuration Release test -test-sdk iphonesimulator")
   end
 
   desc "Run the AFNetworking Tests for Mac OS X"
   task :osx => :prepare do
-    $osx_success = system("xctool -workspace AFNetworking.xcworkspace -scheme 'OS X Tests' build -sdk macosx -configuration Release")
-    $osx_success = system("xctool -workspace AFNetworking.xcworkspace -scheme 'OS X Tests' build-tests -sdk macosx -configuration Release")
-    $osx_success = system("xctool -workspace AFNetworking.xcworkspace -scheme 'OS X Tests' test -test-sdk macosx -sdk macosx -configuration Release")
+    $osx_success = system("xctool -workspace AFNetworking.xcworkspace -scheme 'OS X Tests' -sdk macosx -configuration Release test -test-sdk macosx")
   end
 end
 
diff --git a/Tests/Podfile.lock b/Tests/Podfile.lock
index 9dd558a..6e9fc9d 100644
--- a/Tests/Podfile.lock
+++ b/Tests/Podfile.lock
@@ -17,8 +17,8 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   AFHTTPRequestOperationLogger: 34ba125cb9eeb77a3b67aaaca105720ba3a0798c
-  AFNetworking: 8f204b1ffb21a4ef0f36c83f1e4f052561626bea
+  AFNetworking: 9ec8aafb9269236a7630bd8d9838ce2ba30fa2a0
   Expecta: d46fb1bd78c90a83da0158b9b1e108de106e369f
   OCMock: 79212e5e328378af5cfd6edb5feacfd6c49cd8a3
 
-COCOAPODS: 0.20.2
+COCOAPODS: 0.22.2
diff --git a/Tests/Schemes/OS X Tests.xcscheme b/Tests/Schemes/OS X Tests.xcscheme
index dcb2079..57a00f4 100644
--- a/Tests/Schemes/OS X Tests.xcscheme	
+++ b/Tests/Schemes/OS X Tests.xcscheme	
@@ -4,7 +4,7 @@
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
-      buildImplicitDependencies = "NO">
+      buildImplicitDependencies = "YES">
       <BuildActionEntries>
          <BuildActionEntry
             buildForTesting = "YES"
diff --git a/Tests/Schemes/iOS Tests.xcscheme b/Tests/Schemes/iOS Tests.xcscheme
index f5cbe8b..7883fa9 100644
--- a/Tests/Schemes/iOS Tests.xcscheme	
+++ b/Tests/Schemes/iOS Tests.xcscheme	
@@ -4,7 +4,7 @@
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
-      buildImplicitDependencies = "NO">
+      buildImplicitDependencies = "YES">
       <BuildActionEntries>
          <BuildActionEntry
             buildForTesting = "YES"