diff --git a/DieTests/DieTests.swift b/DieTests/DieTests.swift
index 8fbdd57..853539e 100644
--- a/DieTests/DieTests.swift
+++ b/DieTests/DieTests.swift
@@ -22,7 +22,7 @@ class DieTests: XCTestCase {
 
     @noreturn private func mockExit(status: Int32) {
         exitStatus = status
-        callCount++
+        callCount += 1
         expectation?.fulfill()
         repeat { NSThread.sleepForTimeInterval(0.1) } while (true)
     }
@@ -166,7 +166,7 @@ class DieTests: XCTestCase {
 
     // MARK: - Helper
 
-    func assertThatItCallsDie(shouldCall: Bool = true, line: UInt = __LINE__ , file: String = __FILE__, block: () -> Void) {
+    func assertThatItCallsDie(shouldCall: Bool = true, line: UInt = #line , file: String = #file, block: () -> Void) {
         // when
         dispatchAndWaitForDie(timeout: 2, block: block)
 
diff --git a/circle.yml b/circle.yml
index 92df3bb..65f9eeb 100644
--- a/circle.yml
+++ b/circle.yml
@@ -1,3 +1,7 @@
+machine:
+  xcode:
+    version: "7.3"
+
 test:
   override:
     - xcodebuild clean test -scheme Die