diff --git a/dgl/src/OpenGL.cpp b/dgl/src/OpenGL.cpp
index 8a5151c2..0beb3f45 100644
--- a/dgl/src/OpenGL.cpp
+++ b/dgl/src/OpenGL.cpp
@@ -113,6 +113,7 @@ void Rectangle<T>::_draw(const bool outline)
 // -----------------------------------------------------------------------
 // Possible template data types
 
+#ifndef DPF_TEST_DEMO
 template class Line<double>;
 template class Line<float>;
 template class Line<int>;
@@ -140,6 +141,7 @@ template class Rectangle<int>;
 template class Rectangle<uint>;
 template class Rectangle<short>;
 template class Rectangle<ushort>;
+#endif
 
 // -----------------------------------------------------------------------
 
diff --git a/tests/Demo.cpp b/tests/Demo.cpp
index 89d484f5..db2564a3 100644
--- a/tests/Demo.cpp
+++ b/tests/Demo.cpp
@@ -20,7 +20,7 @@
 
 #include "tests.hpp"
 
-// #define DPF_TEST_POINT_CPP
+#define DPF_TEST_DEMO
 #include "dgl/OpenGL.hpp"
 #include "dgl/src/pugl.cpp"
 #include "dgl/src/Application.cpp"