diff --git a/tests/test_dirs.toml b/tests/test_dirs.toml
index 3774a557..956bc486 100644
--- a/tests/test_dirs.toml
+++ b/tests/test_dirs.toml
@@ -179,6 +179,7 @@ code = '''
 
 [cases.test_dirs_many_reentrant]
 defines.N = [5, 11]
+if = 'BLOCK_COUNT >= 4*N'
 reentrant = true
 code = '''
     lfs_t lfs;
diff --git a/tests/test_relocations.toml b/tests/test_relocations.toml
index 350ac95b..342cb731 100644
--- a/tests/test_relocations.toml
+++ b/tests/test_relocations.toml
@@ -171,7 +171,8 @@ code = '''
 [cases.test_relocations_reentrant]
 reentrant = true
 # TODO fix this case, caused by non-DAG trees
-if = '!(DEPTH == 3 && CACHE_SIZE != 64)'
+# NOTE the second condition is required
+if = '!(DEPTH == 3 && CACHE_SIZE != 64) && 2*FILES < BLOCK_COUNT'
 defines = [
     {FILES=6,  DEPTH=1, CYCLES=20, BLOCK_CYCLES=1},
     {FILES=26, DEPTH=1, CYCLES=20, BLOCK_CYCLES=1},
@@ -239,7 +240,8 @@ code = '''
 [cases.test_relocations_reentrant_renames]
 reentrant = true
 # TODO fix this case, caused by non-DAG trees
-if = '!(DEPTH == 3 && CACHE_SIZE != 64)'
+# NOTE the second condition is required
+if = '!(DEPTH == 3 && CACHE_SIZE != 64) && 2*FILES < BLOCK_COUNT'
 defines = [
     {FILES=6,  DEPTH=1, CYCLES=20, BLOCK_CYCLES=1},
     {FILES=26, DEPTH=1, CYCLES=20, BLOCK_CYCLES=1},