diff --git a/.travis.yml b/.travis.yml
index 9a55345..144aa62 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,5 @@
 language: objective-c
+osx_image: xcode6.4
 
 script:
   - bundle exec rake default
diff --git a/SwiftFilePathTests/SwiftFilePathTests.swift b/SwiftFilePathTests/SwiftFilePathTests.swift
index e760f5b..87738d5 100644
--- a/SwiftFilePathTests/SwiftFilePathTests.swift
+++ b/SwiftFilePathTests/SwiftFilePathTests.swift
@@ -16,7 +16,7 @@ extension String {
     func match(pattern: String) -> Bool {
         var error : NSError?
         let matcher = NSRegularExpression(pattern: pattern, options: nil, error: &error)
-        return matcher?.numberOfMatchesInString(self, options: nil, range: NSMakeRange(0, self.utf16Count)) != 0
+        return matcher?.numberOfMatchesInString(self, options: nil, range: NSMakeRange(0, count(self.utf16))) != 0
     }
     
 }