diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index e54387093a..f144297156 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,3 +1,9 @@
+add_library(instantiation
+	instantiation.cpp
+	)
+
+link_libraries(instantiation)
+
 set(tests
 	setIdentity
 	inverse
@@ -11,7 +17,6 @@ set(tests
 	vector
 	vector3
 	euler
-	instantiation
 	)
 
 foreach(test ${tests})
diff --git a/test/instantiation.cpp b/test/instantiation.cpp
index c7edefe105..6246833526 100644
--- a/test/instantiation.cpp
+++ b/test/instantiation.cpp
@@ -7,17 +7,11 @@
 #include <Scalar.hpp>
 #include <Quaternion.hpp>
 
-using namespace matrix;
+namespace matrix {
 
 template class Vector<float, 2>;
 template class Euler<float>;
 template class Scalar<float>;
 template class Matrix<float, 3, 3>;
 
-int main() {
-	Vector<float, 2> v;
-	Euler<float> e;
-	Scalar<float> s;
-	Matrix<float, 3, 3> m;
-	return 0;
 };