diff --git a/library/constant_time.c b/library/constant_time.c
index 61fb094d9..d4bd331d2 100644
--- a/library/constant_time.c
+++ b/library/constant_time.c
@@ -30,7 +30,7 @@
 #include "mbedtls/error.h"
 #include "mbedtls/platform_util.h"
 
-#include "constant_flow.h"
+#include "../tests/include/test/constant_flow.h"
 
 #include <string.h>
 
diff --git a/library/constant_time_impl.h b/library/constant_time_impl.h
index 1bb07b3e9..b2ef73f70 100644
--- a/library/constant_time_impl.h
+++ b/library/constant_time_impl.h
@@ -37,7 +37,7 @@
 #include "mbedtls/bignum.h"
 #endif
 
-#include "constant_flow.h"
+#include "../tests/include/test/constant_flow.h"
 
 /* armcc5 --gnu defines __GNUC__ but doesn't support GNU's extended asm */
 #if defined(MBEDTLS_HAVE_ASM) && defined(__GNUC__) && (!defined(__ARMCC_VERSION) || \
diff --git a/library/constant_flow.h b/tests/include/test/constant_flow.h
similarity index 100%
rename from library/constant_flow.h
rename to tests/include/test/constant_flow.h
diff --git a/tests/src/helpers.c b/tests/src/helpers.c
index 1062560f2..30fd362c0 100644
--- a/tests/src/helpers.c
+++ b/tests/src/helpers.c
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-#include "constant_flow.h"
+#include <test/constant_flow.h>
 #include <test/helpers.h>
 #include <test/macros.h>
 #include <string.h>
diff --git a/tests/suites/test_suite_base64.function b/tests/suites/test_suite_base64.function
index acdfbea3c..e351ad8a2 100644
--- a/tests/suites/test_suite_base64.function
+++ b/tests/suites/test_suite_base64.function
@@ -2,7 +2,7 @@
 #include "mbedtls/base64.h"
 #include "base64_internal.h"
 #include "constant_time_internal.h"
-#include "constant_flow.h"
+#include <test/constant_flow.h>
 
 #if defined(MBEDTLS_TEST_HOOKS)
 static const char base64_digits[] =
diff --git a/tests/suites/test_suite_bignum.function b/tests/suites/test_suite_bignum.function
index edb369553..caa7e0467 100644
--- a/tests/suites/test_suite_bignum.function
+++ b/tests/suites/test_suite_bignum.function
@@ -3,7 +3,7 @@
 #include "mbedtls/entropy.h"
 #include "constant_time_internal.h"
 #include "bignum_core.h"
-#include "constant_flow.h"
+#include "test/constant_flow.h"
 
 #if MBEDTLS_MPI_MAX_BITS > 792
 #define MPI_MAX_BITS_LARGER_THAN_792
diff --git a/tests/suites/test_suite_bignum_core.function b/tests/suites/test_suite_bignum_core.function
index 32889203e..7ac03d000 100644
--- a/tests/suites/test_suite_bignum_core.function
+++ b/tests/suites/test_suite_bignum_core.function
@@ -3,7 +3,7 @@
 #include "mbedtls/entropy.h"
 #include "bignum_core.h"
 #include "constant_time_internal.h"
-#include "constant_flow.h"
+#include "test/constant_flow.h"
 
 /** Verifies mbedtls_mpi_core_add().
  *
diff --git a/tests/suites/test_suite_bignum_mod.function b/tests/suites/test_suite_bignum_mod.function
index f166079cf..4edc0b90e 100644
--- a/tests/suites/test_suite_bignum_mod.function
+++ b/tests/suites/test_suite_bignum_mod.function
@@ -4,7 +4,7 @@
 #include "bignum_mod.h"
 #include "bignum_mod_raw.h"
 #include "constant_time_internal.h"
-#include "constant_flow.h"
+#include "test/constant_flow.h"
 
 #define TEST_COMPARE_MPI_RESIDUES(a, b) \
     ASSERT_COMPARE((a).p, (a).limbs * sizeof(mbedtls_mpi_uint), \
diff --git a/tests/suites/test_suite_bignum_mod_raw.function b/tests/suites/test_suite_bignum_mod_raw.function
index db4c20f3b..b67ac51df 100644
--- a/tests/suites/test_suite_bignum_mod_raw.function
+++ b/tests/suites/test_suite_bignum_mod_raw.function
@@ -4,7 +4,7 @@
 #include "bignum_core.h"
 #include "bignum_mod_raw.h"
 #include "constant_time_internal.h"
-#include "constant_flow.h"
+#include "test/constant_flow.h"
 
 #include "bignum_mod_raw_invasive.h"
 
diff --git a/tests/suites/test_suite_constant_time.function b/tests/suites/test_suite_constant_time.function
index 330dc6fd6..bdd27f53d 100644
--- a/tests/suites/test_suite_constant_time.function
+++ b/tests/suites/test_suite_constant_time.function
@@ -18,7 +18,7 @@
 #include <mbedtls/constant_time.h>
 #include <constant_time_internal.h>
 
-#include "constant_flow.h"
+#include <test/constant_flow.h>
 /* END_HEADER */
 
 /* BEGIN_CASE */
diff --git a/tests/suites/test_suite_constant_time_hmac.function b/tests/suites/test_suite_constant_time_hmac.function
index b7cfb6686..902acfa2b 100644
--- a/tests/suites/test_suite_constant_time_hmac.function
+++ b/tests/suites/test_suite_constant_time_hmac.function
@@ -5,7 +5,7 @@
 #include <constant_time_internal.h>
 #include "md_psa.h"
 
-#include "constant_flow.h"
+#include <test/constant_flow.h>
 /* END_HEADER */
 
 /* BEGIN_CASE depends_on:MBEDTLS_SSL_SOME_SUITES_USE_MAC:MBEDTLS_SSL_SOME_SUITES_USE_TLS_CBC:MBEDTLS_TEST_HOOKS */
diff --git a/tests/suites/test_suite_ssl.function b/tests/suites/test_suite_ssl.function
index eadf71558..a8c714f39 100644
--- a/tests/suites/test_suite_ssl.function
+++ b/tests/suites/test_suite_ssl.function
@@ -8,7 +8,7 @@
 #include <test/ssl_helpers.h>
 
 #include <constant_time_internal.h>
-#include "constant_flow.h"
+#include <test/constant_flow.h>
 
 #define SSL_MESSAGE_QUEUE_INIT      { NULL, 0, 0, 0 }