diff --git a/extern/polymesh b/extern/polymesh
index 622e04156e2bd771d3131a35fb90008c83b807e3..384f659443ccd40c3bc355d79fd7333d6cf399db 160000
--- a/extern/polymesh
+++ b/extern/polymesh
@@ -1 +1 @@
-Subproject commit 622e04156e2bd771d3131a35fb90008c83b807e3
+Subproject commit 384f659443ccd40c3bc355d79fd7333d6cf399db
diff --git a/extern/typed-geometry b/extern/typed-geometry
index 12b7f4ae7ccf066874388d7223d43868bce7c71c..d00bebc1b4e0428a22c89c9c73403e29ed687ae7 160000
--- a/extern/typed-geometry
+++ b/extern/typed-geometry
@@ -1 +1 @@
-Subproject commit 12b7f4ae7ccf066874388d7223d43868bce7c71c
+Subproject commit d00bebc1b4e0428a22c89c9c73403e29ed687ae7
diff --git a/tests/main.cc b/tests/main.cc
index de3273cb03405948050e138c3f8fd6e2411a94cc..8a0b0be2efd49649fb3d96d09daa54b40c5dcbe5 100644
--- a/tests/main.cc
+++ b/tests/main.cc
@@ -1,4 +1,3 @@
-#define DOCTEST_CONFIG_IMPLEMENT
 #include <doctest.hh>
 
 int main(int argc, char **argv)
diff --git a/tests/objects/cube-test.cc b/tests/objects/cube-test.cc
index 06c54c8ada52d04caa3e868f66e8b446de5f7b94..701d36f788e2dd36c6ec4dfec520dc45133b03a7 100644
--- a/tests/objects/cube-test.cc
+++ b/tests/objects/cube-test.cc
@@ -1,5 +1,3 @@
-#ifdef TG_SUPPORT_CXX17
-
 #include <doctest.hh>
 
 #include <glm/glm.hpp>
@@ -180,5 +178,3 @@ TEST_CASE("Objects.CubePropertiesGlm")
         m2.assert_consistency();
     }
 }
-
-#endif