diff --git a/Generator/test/Generator/test_combination_enumerator.cpp b/Generator/test/Generator/test_combination_enumerator.cpp
index 5bbd939c515..74a4f4bf325 100644
--- a/Generator/test/Generator/test_combination_enumerator.cpp
+++ b/Generator/test/Generator/test_combination_enumerator.cpp
@@ -1,6 +1,7 @@
 #include <CGAL/Combination_enumerator.h>
 #include <iostream>
 #include <vector>
+#include <cassert>
 
 
 using namespace std;
diff --git a/Geomview/test/Geomview/kernel_objects.cpp b/Geomview/test/Geomview/kernel_objects.cpp
index 63b33f2da3b..a73a3962164 100644
--- a/Geomview/test/Geomview/kernel_objects.cpp
+++ b/Geomview/test/Geomview/kernel_objects.cpp
@@ -18,6 +18,8 @@ int main()
 
 #include <CGAL/IO/Geomview_stream.h>
 
+#include <cassert>
+
 typedef CGAL::Cartesian<double> K;
 
 void test_parse_point()
diff --git a/HalfedgeDS/test/HalfedgeDS/test_hds.cpp b/HalfedgeDS/test/HalfedgeDS/test_hds.cpp
index a62f01c747a..e07f491f74a 100644
--- a/HalfedgeDS/test/HalfedgeDS/test_hds.cpp
+++ b/HalfedgeDS/test/HalfedgeDS/test_hds.cpp
@@ -32,6 +32,7 @@
 #include <CGAL/Polyhedron_items_3.h>
 #include <CGAL/HalfedgeDS_decorator.h>
 #include <cstddef>
+#include <cassert>
 
 typedef CGAL::Cartesian<double>   Kernel;
 struct Dummy_traits_3 {
diff --git a/HalfedgeDS/test/HalfedgeDS/test_hds_decorator.cpp b/HalfedgeDS/test/HalfedgeDS/test_hds_decorator.cpp
index d8d16523f12..1cc3d7bf9a5 100644
--- a/HalfedgeDS/test/HalfedgeDS/test_hds_decorator.cpp
+++ b/HalfedgeDS/test/HalfedgeDS/test_hds_decorator.cpp
@@ -31,6 +31,8 @@
 #include <CGAL/Polyhedron_items_3.h>
 #include <CGAL/HalfedgeDS_decorator.h>
 
+#include <cassert>
+
 typedef CGAL::Cartesian<double> Kernel;
 struct Dummy_traits_2 {
     typedef Kernel::Point_2 Point_2;
diff --git a/Modifier/test/Modifier/test_modifier.cpp b/Modifier/test/Modifier/test_modifier.cpp
index e42190f3363..a1ce5e2b616 100644
--- a/Modifier/test/Modifier/test_modifier.cpp
+++ b/Modifier/test/Modifier/test_modifier.cpp
@@ -28,6 +28,8 @@
 #include <CGAL/basic.h>
 #include <CGAL/Modifier_base.h>
 
+#include <cassert>
+
 using CGAL::Modifier_base;
 
 class A {
diff --git a/Polyhedron/test/Polyhedron/test_polyhedron.cpp b/Polyhedron/test/Polyhedron/test_polyhedron.cpp
index 9802e6049d1..3a90a99dcc3 100644
--- a/Polyhedron/test/Polyhedron/test_polyhedron.cpp
+++ b/Polyhedron/test/Polyhedron/test_polyhedron.cpp
@@ -38,6 +38,8 @@
 #include <CGAL/function_objects.h>
 #include <CGAL/halfedgeds_connected_components.h>
 
+#include <cassert>
+
 // A polyhedron modifier that creates a tetrahedron using the
 // incremental builder.
 template < class HDS >
diff --git a/Polyhedron_IO/test/Polyhedron_IO/test_polyhedron_io.cpp b/Polyhedron_IO/test/Polyhedron_IO/test_polyhedron_io.cpp
index 6ee36af0b4a..67a532bfde7 100644
--- a/Polyhedron_IO/test/Polyhedron_IO/test_polyhedron_io.cpp
+++ b/Polyhedron_IO/test/Polyhedron_IO/test_polyhedron_io.cpp
@@ -44,6 +44,7 @@
 #include <fstream>
 #include <sstream>
 #include <cstring>
+#include <cassert>
 
 using namespace CGAL;
 
diff --git a/Profiling_tools/test/Profiling_tools/test_timer.cpp b/Profiling_tools/test/Profiling_tools/test_timer.cpp
index daf91706ffe..53110201aaf 100644
--- a/Profiling_tools/test/Profiling_tools/test_timer.cpp
+++ b/Profiling_tools/test/Profiling_tools/test_timer.cpp
@@ -3,6 +3,8 @@
 #include <CGAL/Real_timer.h>
 #include <CGAL/FPU.h>
 
+#include <cassert>
+
 template <class T>
 double test_timer() {
     T t;
diff --git a/STL_Extension/test/STL_Extension/test_In_place_list.cpp b/STL_Extension/test/STL_Extension/test_In_place_list.cpp
index 6376401654e..60488c18497 100644
--- a/STL_Extension/test/STL_Extension/test_In_place_list.cpp
+++ b/STL_Extension/test/STL_Extension/test_In_place_list.cpp
@@ -30,6 +30,7 @@
 
 #include <CGAL/basic.h>
 #include <cstddef>
+#include <cassert>
 #include <iterator>
 #include <list>
 #include <vector>
diff --git a/STL_Extension/test/STL_Extension/test_composition.cpp b/STL_Extension/test/STL_Extension/test_composition.cpp
index 9427bf8b869..814da7a2780 100644
--- a/STL_Extension/test/STL_Extension/test_composition.cpp
+++ b/STL_Extension/test/STL_Extension/test_composition.cpp
@@ -3,6 +3,7 @@
 #include <functional>
 #include <algorithm>
 #include <numeric>
+#include <cassert>
 
 using CGAL::compose1_1;
 using CGAL::compose1_2;
diff --git a/STL_Extension/test/STL_Extension/test_multiset.cpp b/STL_Extension/test/STL_Extension/test_multiset.cpp
index ad279192d0b..4ca47101615 100644
--- a/STL_Extension/test/STL_Extension/test_multiset.cpp
+++ b/STL_Extension/test/STL_Extension/test_multiset.cpp
@@ -33,6 +33,7 @@
 #include <iostream>
 #include <cstdlib>
 #include <cstring>
+#include <cassert>
 
 void test_massive_insert_and_erase();
 void test_iterators();
diff --git a/Stream_support/test/Stream_support/test_support.cpp b/Stream_support/test/Stream_support/test_support.cpp
index 2391f28949f..2e8f7e37dd6 100644
--- a/Stream_support/test/Stream_support/test_support.cpp
+++ b/Stream_support/test/Stream_support/test_support.cpp
@@ -24,6 +24,7 @@
 
 #include <CGAL/Cartesian.h>
 #include <cstddef>
+#include <cassert>
 #include <sstream>
 #include <CGAL/IO/Ostream_iterator.h>
 #include <CGAL/IO/Istream_iterator.h>
diff --git a/Subdivision_method_3/test/Subdivision_method_3/test_Subdivision_method_3.cpp b/Subdivision_method_3/test/Subdivision_method_3/test_Subdivision_method_3.cpp
index 63d85762920..575a1c71c9a 100644
--- a/Subdivision_method_3/test/Subdivision_method_3/test_Subdivision_method_3.cpp
+++ b/Subdivision_method_3/test/Subdivision_method_3/test_Subdivision_method_3.cpp
@@ -27,6 +27,7 @@
 
 #include <iostream>
 #include <fstream>
+#include <cassert>
 
 #include <CGAL/Cartesian.h>
 #include <CGAL/Polyhedron_3.h>