diff --git a/Algebraic_foundations/include/CGAL/Test/_test_algebraic_structure.h b/Algebraic_foundations/include/CGAL/Test/_test_algebraic_structure.h
index 0f4a7a2ecf5..47f02778833 100644
--- a/Algebraic_foundations/include/CGAL/Test/_test_algebraic_structure.h
+++ b/Algebraic_foundations/include/CGAL/Test/_test_algebraic_structure.h
@@ -18,7 +18,7 @@
 // within this file AS ^= Type
 
 #include <CGAL/basic.h>
-#include <CGAL/_test_basic.h>
+#include <CGAL/Test/_test_basic.h>
 #include <CGAL/Algebraic_structure_traits.h>
 //#include <CGAL/Real_embeddable_traits.h>
 
diff --git a/Algebraic_foundations/include/CGAL/Test/_test_real_embeddable.h b/Algebraic_foundations/include/CGAL/Test/_test_real_embeddable.h
index f90177787a8..521eec0b98e 100644
--- a/Algebraic_foundations/include/CGAL/Test/_test_real_embeddable.h
+++ b/Algebraic_foundations/include/CGAL/Test/_test_real_embeddable.h
@@ -16,7 +16,7 @@
 //    number types.
 
 #include <CGAL/basic.h>
-#include <CGAL/_test_basic.h>
+#include <CGAL/Test/_test_basic.h>
 
 #include <cstddef>
 #include <boost/static_assert.hpp>
diff --git a/Modular_arithmetic/test/Modular_arithmetic/Modular.cpp b/Modular_arithmetic/test/Modular_arithmetic/Modular.cpp
index 5dd9c47f92e..3c8e6f5c7a2 100644
--- a/Modular_arithmetic/test/Modular_arithmetic/Modular.cpp
+++ b/Modular_arithmetic/test/Modular_arithmetic/Modular.cpp
@@ -8,7 +8,7 @@
 #include <cassert>
 #include <CGAL/Modular.h>
 
-#include <CGAL/_test_algebraic_structure.h>
+#include <CGAL/Test/_test_algebraic_structure.h>
 
 int main()
 {   
diff --git a/Polynomial/test/Polynomial/Polynomial.cpp b/Polynomial/test/Polynomial/Polynomial.cpp
index a086962d59a..cbb94702ba9 100644
--- a/Polynomial/test/Polynomial/Polynomial.cpp
+++ b/Polynomial/test/Polynomial/Polynomial.cpp
@@ -1,8 +1,8 @@
 
 #include <CGAL/basic.h>
 
-#include <CGAL/_test_algebraic_structure.h>
-#include <CGAL/_test_real_embeddable.h>
+#include <CGAL/Test/_test_algebraic_structure.h>
+#include <CGAL/Test/_test_real_embeddable.h>
 
 #include <iostream>
 #include <cassert>
diff --git a/Polynomial/test/Polynomial/Polynomial_traits_d.cpp b/Polynomial/test/Polynomial/Polynomial_traits_d.cpp
index 39444293de8..4e6f2befd9c 100644
--- a/Polynomial/test/Polynomial/Polynomial_traits_d.cpp
+++ b/Polynomial/test/Polynomial/Polynomial_traits_d.cpp
@@ -11,7 +11,7 @@
 
 #include <cassert>
 
-#include <CGAL/_test_basic.h>
+#include <CGAL/Test/_test_basic.h>
 
 #include <CGAL/Random.h>