diff --git a/poincare/test/approximation.cpp b/poincare/test/approximation.cpp
index d6573c8d7..d57065930 100644
--- a/poincare/test/approximation.cpp
+++ b/poincare/test/approximation.cpp
@@ -1,12 +1,5 @@
-#include <quiz.h>
-#include <poincare/expression.h>
-#include <poincare/rational.h>
-#include <poincare/addition.h>
 #include <apps/shared/global_context.h>
-#include <ion.h>
-#include <assert.h>
 #include "helper.h"
-#include "./tree/helpers.h"
 
 using namespace Poincare;
 
diff --git a/poincare/test/arithmetic.cpp b/poincare/test/arithmetic.cpp
index 99db22a3c..d8a9ad9c7 100644
--- a/poincare/test/arithmetic.cpp
+++ b/poincare/test/arithmetic.cpp
@@ -1,8 +1,4 @@
-#include <quiz.h>
-#include <poincare/expression.h>
-#include <poincare/integer.h>
 #include <poincare/arithmetic.h>
-#include <assert.h>
 #include <utility>
 #include "helper.h"
 
diff --git a/poincare/test/context.cpp b/poincare/test/context.cpp
index 323a8101d..a5c0c5326 100644
--- a/poincare/test/context.cpp
+++ b/poincare/test/context.cpp
@@ -1,6 +1,3 @@
-#include <quiz.h>
-#include <ion.h>
-#include <assert.h>
 #include <apps/shared/global_context.h>
 #include <poincare/serialization_helper.h>
 #include "helper.h"
diff --git a/poincare/test/expression_order.cpp b/poincare/test/expression_order.cpp
index 59ec0dc6c..adf4ed1be 100644
--- a/poincare/test/expression_order.cpp
+++ b/poincare/test/expression_order.cpp
@@ -1,8 +1,4 @@
-#include <quiz.h>
 #include <apps/shared/global_context.h>
-#include <poincare/expression.h>
-#include <poincare/include/poincare_nodes.h>
-#include <assert.h>
 #include "helper.h"
 
 using namespace Poincare;
@@ -79,7 +75,7 @@ void assert_multiplication_or_addition_is_ordered_as(Expression e1, Expression e
         &globalContext,
         true);
   } else {
-    assert(e1.type() == ExpressionNode::Type::Addition);
+    quiz_assert(e1.type() == ExpressionNode::Type::Addition);
     static_cast<Addition&>(e1).sortChildrenInPlace(
         [](const ExpressionNode * e1, const ExpressionNode * e2, bool canBeInterrupted) { return ExpressionNode::SimplificationOrder(e1, e2, false, canBeInterrupted); },
         &globalContext,
diff --git a/poincare/test/expression_properties.cpp b/poincare/test/expression_properties.cpp
index afa85d849..2296092e3 100644
--- a/poincare/test/expression_properties.cpp
+++ b/poincare/test/expression_properties.cpp
@@ -1,9 +1,5 @@
-#include <quiz.h>
 #include <apps/shared/global_context.h>
-#include <poincare/decimal.h>
-#include <assert.h>
 #include "helper.h"
-#include "tree/helpers.h"
 
 using namespace Poincare;
 
diff --git a/poincare/test/expression_serialization.cpp b/poincare/test/expression_serialization.cpp
index abe0d4c4a..618af624b 100644
--- a/poincare/test/expression_serialization.cpp
+++ b/poincare/test/expression_serialization.cpp
@@ -1,6 +1,3 @@
-#include <quiz.h>
-#include <ion.h>
-#include <assert.h>
 #include "helper.h"
 
 using namespace Poincare;
diff --git a/poincare/test/expression_to_layout.cpp b/poincare/test/expression_to_layout.cpp
index bff29d596..045cb3b0f 100644
--- a/poincare/test/expression_to_layout.cpp
+++ b/poincare/test/expression_to_layout.cpp
@@ -1,8 +1,5 @@
-#include <quiz.h>
-#include <assert.h>
 #include <poincare_layouts.h>
 #include "helper.h"
-#include "tree/helpers.h"
 
 using namespace Poincare;
 
diff --git a/poincare/test/helper.cpp b/poincare/test/helper.cpp
index d79d8b27d..d733ab22e 100644
--- a/poincare/test/helper.cpp
+++ b/poincare/test/helper.cpp
@@ -1,7 +1,6 @@
 #include "helper.h"
 #include <apps/shared/global_context.h>
 #include <poincare/src/parsing/parser.h>
-#include <assert.h>
 
 using namespace Poincare;
 
diff --git a/poincare/test/helpers.cpp b/poincare/test/helpers.cpp
index 0032649d1..9c6c9b3f8 100644
--- a/poincare/test/helpers.cpp
+++ b/poincare/test/helpers.cpp
@@ -1,5 +1,3 @@
-#include <quiz.h>
-#include <assert.h>
 #include <poincare/helpers.h>
 #include "helper.h"
 
diff --git a/poincare/test/ieee754.cpp b/poincare/test/ieee754.cpp
index 800dbc9fc..85bdee9d4 100644
--- a/poincare/test/ieee754.cpp
+++ b/poincare/test/ieee754.cpp
@@ -1,9 +1,6 @@
-#include <quiz.h>
 #include <poincare/ieee754.h>
 #include <string.h>
-#include <ion.h>
 #include <stdlib.h>
-#include <assert.h>
 #include <cmath>
 #include "helper.h"
 
@@ -26,8 +23,8 @@ QUIZ_CASE(ieee754_next_and_previous) {
   assert_next_and_previous_IEEE754_is<float>(-0.0f, 0.0f);
   assert_next_and_previous_IEEE754_is<float>(-1.4E-45f, -0.0f);
   assert_next_and_previous_IEEE754_is<float>(-3.4359738E10f, -3.43597363E10f);
-  assert(IEEE754<float>::next(3.4028235E38f) == INFINITY);
-  assert(IEEE754<float>::previous(-3.4028235E38f) == -INFINITY);
+  quiz_assert(IEEE754<float>::next(3.4028235E38f) == INFINITY);
+  quiz_assert(IEEE754<float>::previous(-3.4028235E38f) == -INFINITY);
 
   assert_next_and_previous_IEEE754_is<double>(0.0f, 4.94065645841246544176568792868E-324);
   assert_next_and_previous_IEEE754_is<double>(INFINITY, INFINITY);
diff --git a/poincare/test/integer.cpp b/poincare/test/integer.cpp
index 2d1cf098e..d58da4a47 100644
--- a/poincare/test/integer.cpp
+++ b/poincare/test/integer.cpp
@@ -1,8 +1,3 @@
-#include <quiz.h>
-#include <poincare/integer.h>
-#include <assert.h>
-
-#include "tree/helpers.h"
 #include "helper.h"
 
 using namespace Poincare;
diff --git a/poincare/test/layout.cpp b/poincare/test/layout.cpp
index aad8ea97b..983184abb 100644
--- a/poincare/test/layout.cpp
+++ b/poincare/test/layout.cpp
@@ -1,10 +1,5 @@
-#include <quiz.h>
 #include <poincare_layouts.h>
-#include <apps/shared/global_context.h>
-#include <ion.h>
-#include <assert.h>
 #include "helper.h"
-#include "./tree/helpers.h"
 
 using namespace Poincare;
 
diff --git a/poincare/test/layout_cursor.cpp b/poincare/test/layout_cursor.cpp
index f97f6505a..de87d2afe 100644
--- a/poincare/test/layout_cursor.cpp
+++ b/poincare/test/layout_cursor.cpp
@@ -1,4 +1,3 @@
-#include <quiz.h>
 #include <poincare_layouts.h>
 #include "helper.h"
 
diff --git a/poincare/test/layout_serialization.cpp b/poincare/test/layout_serialization.cpp
index 5a07238ef..4e0115faa 100644
--- a/poincare/test/layout_serialization.cpp
+++ b/poincare/test/layout_serialization.cpp
@@ -1,14 +1,11 @@
-#include <quiz.h>
-#include <ion.h>
-#include <assert.h>
 #include <poincare_layouts.h>
 #include "helper.h"
 
 using namespace Poincare;
 
 QUIZ_CASE(poincare_layout_serialization) {
-  assert(UCodePointLeftSystemParenthesis == 0x12);
-  assert(UCodePointRightSystemParenthesis == 0x13);
+  quiz_assert(UCodePointLeftSystemParenthesis == 0x12);
+  quiz_assert(UCodePointRightSystemParenthesis == 0x13);
 
   // AbsoluteValueLayout
   assert_layout_serialize_to(
diff --git a/poincare/test/layout_to_expression.cpp b/poincare/test/layout_to_expression.cpp
index 56ba8077b..f991c0b8a 100644
--- a/poincare/test/layout_to_expression.cpp
+++ b/poincare/test/layout_to_expression.cpp
@@ -1,10 +1,5 @@
-#include <quiz.h>
 #include <poincare_layouts.h>
-#include <apps/shared/global_context.h>
-#include <ion.h>
-#include <assert.h>
 #include "helper.h"
-#include "./tree/helpers.h"
 
 using namespace Poincare;
 
diff --git a/poincare/test/parsing.cpp b/poincare/test/parsing.cpp
index 560714caa..dc11804ef 100644
--- a/poincare/test/parsing.cpp
+++ b/poincare/test/parsing.cpp
@@ -1,8 +1,5 @@
 #include <poincare/init.h>
 #include <poincare/exception_checkpoint.h>
-#include <ion.h>
-#include <cmath>
-#include <assert.h>
 #include <poincare/src/parsing/parser.h>
 #include "tree/helpers.h"
 #include "helper.h"
diff --git a/poincare/test/print_float.cpp b/poincare/test/print_float.cpp
index b5ea82238..56c0aca6f 100644
--- a/poincare/test/print_float.cpp
+++ b/poincare/test/print_float.cpp
@@ -1,12 +1,5 @@
-#include <quiz.h>
-#include <poincare/preferences.h>
-#include <poincare/float.h>
-#include <poincare/decimal.h>
-#include <poincare/rational.h>
 #include <string.h>
-#include <ion.h>
 #include <stdlib.h>
-#include <assert.h>
 #include <cmath>
 #include "helper.h"
 
diff --git a/poincare/test/print_int.cpp b/poincare/test/print_int.cpp
index 0edd100de..a91fd4ded 100644
--- a/poincare/test/print_int.cpp
+++ b/poincare/test/print_int.cpp
@@ -1,6 +1,4 @@
-#include <quiz.h>
 #include <poincare/print_int.h>
-#include <assert.h>
 #include "helper.h"
 
 using namespace Poincare;
diff --git a/poincare/test/rational.cpp b/poincare/test/rational.cpp
index 35b878032..0b481c485 100644
--- a/poincare/test/rational.cpp
+++ b/poincare/test/rational.cpp
@@ -1,9 +1,4 @@
-#include <quiz.h>
-#include <poincare/integer.h>
-#include <poincare/rational.h>
-#include <assert.h>
 #include "helper.h"
-#include "tree/helpers.h"
 
 using namespace Poincare;
 
diff --git a/poincare/test/simplification.cpp b/poincare/test/simplification.cpp
index 86a546098..8b18db527 100644
--- a/poincare/test/simplification.cpp
+++ b/poincare/test/simplification.cpp
@@ -1,12 +1,5 @@
-#include <quiz.h>
-#include <poincare/expression.h>
-#include <poincare/rational.h>
-#include <poincare/addition.h>
-#include <apps/shared/global_context.h>
-#include <ion.h>
-#include <assert.h>
+#include <ion/storage.h>
 #include "helper.h"
-#include "./tree/helpers.h"
 
 using namespace Poincare;
 
diff --git a/poincare/test/tree/tree_handle.cpp b/poincare/test/tree/tree_handle.cpp
index ff66ba727..421bafb25 100644
--- a/poincare/test/tree/tree_handle.cpp
+++ b/poincare/test/tree/tree_handle.cpp
@@ -2,7 +2,6 @@
 #include <poincare/tree_handle.h>
 #include <poincare/init.h>
 #include <poincare/exception_checkpoint.h>
-#include <assert.h>
 #include "blob_node.h"
 #include "pair_node.h"