diff --git a/test/unit/geometry/geometry_envelope_test.cpp b/test/unit/geometry/geometry_envelope_test.cpp
index 4a8bdc2ee..75049820a 100644
--- a/test/unit/geometry/geometry_envelope_test.cpp
+++ b/test/unit/geometry/geometry_envelope_test.cpp
@@ -1,8 +1,7 @@
 #include "catch.hpp"
 
 #include <mapnik/geometry.hpp>
-#include <mapnik/geometry_envelope_impl.hpp>
-//#include <mapnik/geometry_correct.hpp>
+#include <mapnik/geometry_envelope.hpp>
 
 namespace {
 
diff --git a/test/unit/geometry/geometry_test_helper.cpp b/test/unit/geometry/geometry_test_helper.cpp
new file mode 100644
index 000000000..44bcce596
--- /dev/null
+++ b/test/unit/geometry/geometry_test_helper.cpp
@@ -0,0 +1,15 @@
+#include <mapnik/geometry.hpp>
+#include <mapnik/geometry_envelope.hpp>
+#include <mapnik/geometry_envelope_impl.hpp>
+
+
+namespace mapnik { namespace geometry {
+// instantiate types required by geometry_envelope_test
+template mapnik::box2d<int> envelope(geometry<int> const& geom);
+template mapnik::box2d<float> envelope(geometry<float> const& geom);
+template mapnik::box2d<int> envelope(polygon<int> const& geom);
+template mapnik::box2d<float> envelope(polygon<float> const& geom);
+template mapnik::box2d<int> envelope(geometry_collection<int> const& geom);
+template mapnik::box2d<float> envelope(geometry_collection<float> const& geom);
+
+}}