diff --git a/.gitmodules b/.gitmodules
index f59b9d8..b4b58b4 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
-[submodule "tests/catch"]
-	path = tests/catch
-	url = https://github.com/philsquared/Catch.git
+[submodule "lib/catch"]
+	path = lib/catch
+	url = https://github.com/philsquared/Catch
diff --git a/lib/catch b/lib/catch
new file mode 160000
index 0000000..e27c4ee
--- /dev/null
+++ b/lib/catch
@@ -0,0 +1 @@
+Subproject commit e27c4ee04282f60aefcc9b1062a74f92cf6c1a2b
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 06e818c..8ae582e 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -5,7 +5,7 @@ file(GLOB core_sources "*.cpp")
 include_directories(
 	${Boost_INCLUDE_DIRS}
 	${PROJECT_SOURCE_DIR}/include
-	catch/single_include
+	${PROJECT_SOURCE_DIR}/lib/catch/single_include
 )
 
 set(libraries
diff --git a/tests/catch b/tests/catch
deleted file mode 160000
index 88732e8..0000000
--- a/tests/catch
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 88732e85b2ac0233bba6fec5c032d02f9c5c230b