diff --git a/tests/cwrs32-test.c b/tests/cwrs32-test.c
index 7332ca5bb9515e96265c6b28bbb9521ae73104df..345bee10895d81cb75b263ec0894dddfe82b7a6a 100644
--- a/tests/cwrs32-test.c
+++ b/tests/cwrs32-test.c
@@ -5,6 +5,8 @@
 #include <stdio.h>
 #include <string.h>
 
+#define CELT_C 
+#include "../libcelt/stack_alloc.h"
 #include "../libcelt/rangeenc.c"
 #include "../libcelt/rangedec.c"
 #include "../libcelt/entenc.c"
@@ -24,6 +26,7 @@ static const int kmax[15]={
 
 int main(int _argc,char **_argv){
   int n;
+  ALLOC_STACK;
   for(n=2;n<=NMAX;n++){
     int dk;
     int k;
diff --git a/tests/dft-test.c b/tests/dft-test.c
index 348746c0f0ca50c9163734c0eefd82cf619b86fe..313242b2b5289edb64b13d3906ddfa35d490bbeb 100644
--- a/tests/dft-test.c
+++ b/tests/dft-test.c
@@ -5,6 +5,8 @@
 #include <stdio.h>
 #include "kiss_fft.h"
 
+#define CELT_C 
+#include "../libcelt/stack_alloc.h"
 #include "../libcelt/kiss_fft.c"
 
 
@@ -102,6 +104,7 @@ void test1d(int nfft,int isinverse)
 
 int main(int argc,char ** argv)
 {
+    ALLOC_STACK;
     if (argc>1) {
         int k;
         for (k=1;k<argc;++k) {
diff --git a/tests/laplace-test.c b/tests/laplace-test.c
index b797c1a0a41ddd47bcc9b0301dbadd7491c099cd..6e5a0833f31d19811f13da5e6a8bf8a69fd0d879 100644
--- a/tests/laplace-test.c
+++ b/tests/laplace-test.c
@@ -5,7 +5,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include "laplace.h"
-#include "stack_alloc.h"
+#define CELT_C 
+#include "../libcelt/stack_alloc.h"
 
 #include "../libcelt/rangeenc.c"
 #include "../libcelt/rangedec.c"
diff --git a/tests/mdct-test.c b/tests/mdct-test.c
index 6a9393d0fbf0a174c9f4bcc4cd2bd4fc986fe040..7c2a015c36633cff1a4f7932c11797ded4206973 100644
--- a/tests/mdct-test.c
+++ b/tests/mdct-test.c
@@ -4,7 +4,8 @@
 
 #include <stdio.h>
 #include "mdct.h"
-#include "stack_alloc.h"
+#define CELT_C 
+#include "../libcelt/stack_alloc.h"
 
 #include "../libcelt/kiss_fft.c"
 #include "../libcelt/mdct.c"
diff --git a/tests/real-fft-test.c b/tests/real-fft-test.c
index 9f49795fb44a84cadcad86b2caa235c3b4ff99ee..aa2f588ed7244a2bed5c0d3d3edd6e469567aa0f 100644
--- a/tests/real-fft-test.c
+++ b/tests/real-fft-test.c
@@ -7,6 +7,8 @@
 #include <stdio.h>
 #include <string.h>
 
+#define CELT_C 
+#include "../libcelt/stack_alloc.h"
 #include "../libcelt/kiss_fft.c"
 #include "../libcelt/kiss_fftr.c"
 
@@ -86,6 +88,7 @@ int main(void)
     kiss_fft_scalar rin[NFFT+2];
     kiss_fft_scalar rout[NFFT+2];
     kiss_fft_scalar zero;
+    ALLOC_STACK;
     memset(&zero,0,sizeof(zero) ); // ugly way of setting short,int,float,double, or __m128 to zero
 
     for (i=0;i<NFFT;++i) {