diff --git a/apps/solver/test/equation_store.cpp b/apps/solver/test/equation_store.cpp
index 98a68eeaf..84664487f 100644
--- a/apps/solver/test/equation_store.cpp
+++ b/apps/solver/test/equation_store.cpp
@@ -75,8 +75,9 @@ QUIZ_CASE(equation_solve) {
   assert_equation_system_exact_solve_to(equations0, EquationStore::Error::TooManyVariables, EquationStore::Type::LinearSystem, (const char **)variables1, nullptr, 0);
 
   // tototototot = 0
+  /* The variable name being too long, the expression 'tototototot = 0' cannot be defined. */
   const char * equations01[] = {"tototototot=0", 0};
-  assert_equation_system_exact_solve_to(equations01, EquationStore::Error::VariableNameTooLong, EquationStore::Type::LinearSystem, (const char **)variables1, nullptr, 0);
+  assert_equation_system_exact_solve_to(equations01, EquationStore::Error::EquationUndefined, EquationStore::Type::LinearSystem, (const char **)variables1, nullptr, 0);
 
   // x^2+y = 0
   const char * equations1[] = {"x^2+y=0", 0};
diff --git a/poincare/test/properties.cpp b/poincare/test/properties.cpp
index e9e78a012..21776cfb8 100644
--- a/poincare/test/properties.cpp
+++ b/poincare/test/properties.cpp
@@ -90,7 +90,7 @@ void assert_parsed_expression_has_variables(const char * expression, const char
   int numberOfVariables = e.getVariables(globalContext, [](const char * symbol) { return true; }, (char *)variableBuffer, k_maxVariableSize);
   quiz_assert(trueNumberOfVariables == numberOfVariables);
   if (numberOfVariables < 0) {
-    // Too many variables or variable name too long
+    // Too many variables
     return;
   }
   int index = 0;
@@ -109,8 +109,8 @@ QUIZ_CASE(poincare_get_variables) {
   assert_parsed_expression_has_variables("a+x^2+2*y+k!*A", variableBuffer3, 5);
   const char * variableBuffer4[] = {"BABA","abab", ""};
   assert_parsed_expression_has_variables("BABA+abab", variableBuffer4, 2);
-  const char * variableBuffer5[] = {""};
-  assert_parsed_expression_has_variables("BBBBBBBBBBBBBBBBBBBBBBBBBBBBB", variableBuffer5, -2);
+  const char * variableBuffer5[] = {"BBBBBB", ""};
+  assert_parsed_expression_has_variables("BBBBBB", variableBuffer5, 1);
   const char * variableBuffer6[] = {""};
   assert_parsed_expression_has_variables("a+b+c+d+e+f+g+h+i+j+k+l+m+n+o+p+q+r+s+t+aa+bb+cc+dd+ee+ff+gg+hh+ii+jj+kk+ll+mm+nn+oo", variableBuffer6, -1);
 }