diff --git a/.swift-version b/.swift-version
index b1b7b7c..8bbe6cf 100644
--- a/.swift-version
+++ b/.swift-version
@@ -1 +1 @@
-DEVELOPMENT-SNAPSHOT-2016-01-25-a
+2.2
diff --git a/.travis.yml b/.travis.yml
index df312b8..781552c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,11 +1,14 @@
 os:
   - osx
-  - linux
+env:
+  - SWIFT_VERSION=2.2
 language: generic
 sudo: required
 dist: trusty
-osx_image: xcode7.2
+osx_image: xcode7.3
 install:
-  - eval "$(curl -sL https://gist.githubusercontent.com/kylef/5c0475ff02b7c7671d2a/raw/02090c7ede5a637b76e6df1710e83cd0bbe7dcdf/swiftenv-install.sh)"
+- eval "$(curl -sL https://gist.githubusercontent.com/kylef/5c0475ff02b7c7671d2a/raw/9f442512a46d7a2af7b850d65a7e9bd31edfb09b/swiftenv-install.sh)"
+- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then sudo python -m ensurepip; fi
+- sudo pip install swim
 script:
-- make test
+- swim test
diff --git a/Makefile b/Makefile
deleted file mode 100644
index c95da49..0000000
--- a/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-stencil:
-	@echo "Building Stencil"
-	@swift build
-
-test: stencil
-	@echo "Running Tests"
-	@.build/debug/spectre-build
diff --git a/Package.swift b/Package.swift
index 2c970d1..00638df 100644
--- a/Package.swift
+++ b/Package.swift
@@ -6,6 +6,6 @@ let package = Package(
     .Package(url: "https://github.com/kylef/PathKit.git", majorVersion: 0, minor: 6),
   ],
   testDependencies: [
-    .Package(url: "https://github.com/kylef/spectre-build", majorVersion: 0),
+    .Package(url: "https://github.com/kylef/Spectre.git", majorVersion: 0),
   ]
 )
diff --git a/Tests/Nodes/ForNodeSpec.swift b/Tests/ForNodeSpec.swift
similarity index 100%
rename from Tests/Nodes/ForNodeSpec.swift
rename to Tests/ForNodeSpec.swift
diff --git a/Tests/Nodes/IfNodeSpec.swift b/Tests/IfNodeSpec.swift
similarity index 100%
rename from Tests/Nodes/IfNodeSpec.swift
rename to Tests/IfNodeSpec.swift
diff --git a/Tests/TemplateLoader/IncludeSpec.swift b/Tests/IncludeSpec.swift
similarity index 97%
rename from Tests/TemplateLoader/IncludeSpec.swift
rename to Tests/IncludeSpec.swift
index 1e94fa1..a20c41d 100644
--- a/Tests/TemplateLoader/IncludeSpec.swift
+++ b/Tests/IncludeSpec.swift
@@ -5,7 +5,7 @@ import PathKit
 
 func testInclude() {
   describe("Include") {
-    let path = Path(__FILE__) + ".." + ".." + "fixtures"
+    let path = Path(__FILE__) + ".." + "fixtures"
     let loader = TemplateLoader(paths: [path])
 
     $0.describe("parsing") {
diff --git a/Tests/TemplateLoader/InheritenceSpec.swift b/Tests/InheritenceSpec.swift
similarity index 87%
rename from Tests/TemplateLoader/InheritenceSpec.swift
rename to Tests/InheritenceSpec.swift
index ba2d0ca..0b692b8 100644
--- a/Tests/TemplateLoader/InheritenceSpec.swift
+++ b/Tests/InheritenceSpec.swift
@@ -5,7 +5,7 @@ import PathKit
 
 func testInheritence() {
   describe("Inheritence") {
-    let path = Path(__FILE__) + ".." + ".." + "fixtures"
+    let path = Path(__FILE__) + ".." + "fixtures"
     let loader = TemplateLoader(paths: [path])
 
     $0.it("can inherit from another template") {
diff --git a/Tests/Nodes/NodeSpec.swift b/Tests/NodeSpec.swift
similarity index 100%
rename from Tests/Nodes/NodeSpec.swift
rename to Tests/NodeSpec.swift
diff --git a/Tests/Nodes/NowNodeSpec.swift b/Tests/NowNodeSpec.swift
similarity index 100%
rename from Tests/Nodes/NowNodeSpec.swift
rename to Tests/NowNodeSpec.swift
diff --git a/Tests/TemplateLoaderSpec.swift b/Tests/TemplateLoaderSpec.swift
index 1f207de..d280d3a 100644
--- a/Tests/TemplateLoaderSpec.swift
+++ b/Tests/TemplateLoaderSpec.swift
@@ -5,7 +5,7 @@ import PathKit
 
 func testTemplateLoader() {
   describe("TemplateLoader") {
-    let path = Path(__FILE__) + ".." + ".." + "Tests" + "fixtures"
+    let path = Path(__FILE__) + ".."  + "fixtures"
     let loader = TemplateLoader(paths: [path])
 
     $0.it("returns nil when a template cannot be found") {