diff --git a/CHANGELOG.org b/CHANGELOG.org
index c5a9fa2..7fcf014 100644
--- a/CHANGELOG.org
+++ b/CHANGELOG.org
@@ -16,13 +16,14 @@
 
 * Current
 ** Added
-Added 17/24 working tests for armv7l
+Added 22/24 working tests for armv7l
 
 ** Changed
 
 ** Fixed
 Fixed unsigned division in ARMv7l port
 Fixed non-uniform behavior across locales and *BSDs
+Fixed broken stack in ARMv7l thanks to dddddd
 
 ** Removed
 
diff --git a/cc_core.c b/cc_core.c
index 14bbda1..f02b835 100644
--- a/cc_core.c
+++ b/cc_core.c
@@ -873,7 +873,7 @@ void collect_local()
 	{
 		if(KNIGHT_POSIX == Architecture) a->depth = 4;
 		else if(X86 == Architecture) a->depth = -8;
-		else if(ARMV7L == Architecture) a->depth = 4;
+		else if(ARMV7L == Architecture) a->depth = 8;
 	}
 	else if(NULL == function->locals)
 	{
diff --git a/makefile b/makefile
index d34aefd..7099741 100644
--- a/makefile
+++ b/makefile
@@ -112,6 +112,10 @@ test: test00-knight-posix-binary \
 	test20-armv7l-binary \
 	test21-armv7l-binary \
 	test22-armv7l-binary \
+	test23-armv7l-binary \
+	test24-armv7l-binary \
+	test25-armv7l-binary \
+	test26-armv7l-binary \
 	test00-x86-binary \
 	test01-x86-binary \
 	test02-x86-binary \
@@ -137,6 +141,8 @@ test: test00-knight-posix-binary \
 	test22-x86-binary \
 	test23-x86-binary \
 	test24-x86-binary \
+	test25-x86-binary \
+	test26-x86-binary \
 	test99-x86-binary \
 	test100-x86-binary | results
 	sha256sum -c test/test.answers
@@ -291,6 +297,18 @@ test21-armv7l-binary: M2-Planet | results
 test22-armv7l-binary: M2-Planet | results
 	test/test22/hello-armv7l.sh
 
+test23-armv7l-binary: M2-Planet | results
+	test/test23/hello-armv7l.sh
+
+test24-armv7l-binary: M2-Planet | results
+	test/test24/hello-armv7l.sh
+
+test25-armv7l-binary: M2-Planet | results
+	test/test25/hello-armv7l.sh
+
+test26-armv7l-binary: M2-Planet | results
+	test/test26/hello-armv7l.sh
+
 test00-x86-binary: M2-Planet | results
 	test/test00/hello-x86.sh
 
@@ -366,6 +384,12 @@ test23-x86-binary: M2-Planet | results
 test24-x86-binary: M2-Planet | results
 	test/test24/hello-x86.sh
 
+test25-x86-binary: M2-Planet | results
+	test/test25/hello-x86.sh
+
+test26-x86-binary: M2-Planet | results
+	test/test26/hello-x86.sh
+
 test99-x86-binary: M2-Planet | results
 	test/test99/hello-x86.sh
 
diff --git a/test/test.answers b/test/test.answers
index 6164d42..0131ef5 100644
--- a/test/test.answers
+++ b/test/test.answers
@@ -31,8 +31,8 @@ cf429533b6473e725c6f6f046ac028181090c532f52f73cd07b87f1e6da64820  test/results/t
 d2b4095983ddd89328e17d983dd8802956c30a4de67267a080772b2e43ee1466  test/results/test10-armv7l-binary
 c1b5a2a3cd46c5e95e5540e871c2a916e028684ca80f51c001ef489342e27625  test/results/test10-knight-posix-binary
 020e86020819cc4963e6185b22e534fcf8306b6cb116f12643f254a24688ff0a  test/results/test10-x86-binary
-e42c3c0759430314229f431a492be9f0f04ccb79552a68fc4cfc6a692c2a55f8  test/results/test100-knight-posix-binary
-7449bc586cf05b4bf63908b74280ad9e59aaf4f6d142af621680961cf5fecfc4  test/results/test100-x86-binary
+1c64ac9e453c8404bc4c9024ded0f39092412e211ac55e4d582f177d06485f52  test/results/test100-knight-posix-binary
+2b134bb720187047e28a97015bf39abf8b637106f7bcfa83c6ea4dc3a8401b79  test/results/test100-x86-binary
 ea5065ec0604f4701713d8c96a588f96ffc610d7787bca0c3bb3af6db884691a  test/results/test11-armv7l-binary
 63fd5fbf389d1b19031026df193ec55e98d923b8568007125b80bc246c094496  test/results/test11-knight-posix-binary
 3fd11bad4a426ce1ff8fd9c6d7d2b943effae9f3f5740b7376e426e9b0555851  test/results/test11-x86-binary
@@ -69,9 +69,15 @@ cefc5a53513abdb9069dc8bdb7b4529307420d5dd412a10112c3253bdcd29c46  test/results/t
 f73bbd1494149af5a45cb21b130c46ea35bc08c26cd2a47a168f9bf90a9f46d1  test/results/test22-armv7l-binary
 7ccc16255ce81a9b35934649b5446face10db899cadaf00008c582934eefaa37  test/results/test22-knight-posix-binary
 3d0a08c9f38b995318f459884880dbcd309930fb9f51de05c83eb1fcc3fa1825  test/results/test22-x86-binary
+042400370025cf226968523971430152cfc672187b330c977f424409ec30627d  test/results/test23-armv7l-binary
 1b86c800067f64ffd6cfd4b39155b81e3b0fc7ffa6d43d1edd75852edd2d583f  test/results/test23-knight-posix-binary
 3060147b0d56e30c6d9a36ed4675feed306c398df365d2c1c9e2d1c88b40cf3e  test/results/test23-x86-binary
+a18410615d2e4fa7c502f3b952e05c2a39175c7c81b756f2ab2415c6d6eb2c9f  test/results/test24-armv7l-binary
 a1053415b79f08f8bcc9ebda8c9b096ed4e66c483504ba3d7d4dbebad2e3fabf  test/results/test24-knight-posix-binary
 ff810940f7e8a9df916b20bc95d7d83a7165c57853e343417826a9f5a607c2db  test/results/test24-x86-binary
+98151395e07ffc6ee3b4cc4b8cfd26f835628402b48206800c7b410d3a9e04b8  test/results/test25-armv7l-binary
+225ac89b740574661c9cafcd25d358ba2effbc7e7af1797c930817bc1e6abd7b  test/results/test25-x86-binary
+84392bc3f47b350cc20dd9a5a78892d11fccb5abb7c6a102fcb2764d5a31442c  test/results/test26-armv7l-binary
+1e6973cdaddca6014e1fdda80312b6139d3aef55da332616c278f2c1d5330666  test/results/test26-x86-binary
 bea554c06c8ecdb9eaae2c586a2006487968625b9570cbe305f69959c0e680e7  test/results/test99-knight-posix-binary
 140af7fb3ef89d84b21bd3fe69f0d3260650ec0467c0ffadf9268fad573a397f  test/results/test99-x86-binary
diff --git a/test/test100/proof.answer b/test/test100/proof.answer
index fecfc19..ea514cc 100644
--- a/test/test100/proof.answer
+++ b/test/test100/proof.answer
@@ -1 +1 @@
-1a06f00383c0200463f09f48a5bfc0d485eeb2b52a9fb4232169099d17446c1d  test/test100/proof
+b4c27994226f259c5fe2189915727eada317c941d010604db23e6b3ef7342084  test/test100/proof
diff --git a/test/test25/hello-armv7l.sh b/test/test25/hello-armv7l.sh
index d3f52d0..965b947 100755
--- a/test/test25/hello-armv7l.sh
+++ b/test/test25/hello-armv7l.sh
@@ -50,7 +50,7 @@ hex2 -f test/common_armv7l/ELF-armv7l-debug.hex2 \
 	--LittleEndian \
 	--architecture armv7l \
 	--BaseAddress 0x10000 \
-	-o test/results/test25-binary \
+	-o test/results/test25-armv7l-binary \
 	--exec_enable || exit 4
 
 exit 0
diff --git a/test/test25/hello-x86.sh b/test/test25/hello-x86.sh
index 4dce086..5df34f2 100755
--- a/test/test25/hello-x86.sh
+++ b/test/test25/hello-x86.sh
@@ -50,7 +50,7 @@ hex2 -f test/common_x86/ELF-i386-debug.hex2 \
 	--LittleEndian \
 	--architecture x86 \
 	--BaseAddress 0x8048000 \
-	-o test/results/test25-binary \
+	-o test/results/test25-x86-binary \
 	--exec_enable || exit 4
 
 exit 0
diff --git a/test/test26/hello-armv7l.sh b/test/test26/hello-armv7l.sh
index 2b8f6d8..68f4c13 100755
--- a/test/test26/hello-armv7l.sh
+++ b/test/test26/hello-armv7l.sh
@@ -53,7 +53,7 @@ hex2 -f test/common_armv7l/ELF-armv7l-debug.hex2 \
 	--LittleEndian \
 	--architecture armv7l \
 	--BaseAddress 0x10000 \
-	-o test/results/test26-binary \
+	-o test/results/test26-armv7l-binary \
 	--exec_enable || exit 4
 
 exit 0
diff --git a/test/test26/hello-x86.sh b/test/test26/hello-x86.sh
index f1778b6..2556252 100755
--- a/test/test26/hello-x86.sh
+++ b/test/test26/hello-x86.sh
@@ -53,7 +53,7 @@ hex2 -f test/common_x86/ELF-i386-debug.hex2 \
 	--LittleEndian \
 	--architecture x86 \
 	--BaseAddress 0x8048000 \
-	-o test/results/test26-binary \
+	-o test/results/test26-x86-binary \
 	--exec_enable || exit 4
 
 exit 0