diff --git a/tests/suites/test_suite_hmac_shax.function b/tests/suites/test_suite_hmac_shax.function
index 66c67db..214002b 100644
--- a/tests/suites/test_suite_hmac_shax.function
+++ b/tests/suites/test_suite_hmac_shax.function
@@ -1,7 +1,7 @@
 BEGIN_HEADER
 #include <polarssl/sha1.h>
-#include <polarssl/sha2.h>
-#include <polarssl/sha4.h>
+#include <polarssl/sha256.h>
+#include <polarssl/sha512.h>
 END_HEADER
 
 BEGIN_CASE
diff --git a/tests/suites/test_suite_md.function b/tests/suites/test_suite_md.function
index 31390af..81d8f03 100644
--- a/tests/suites/test_suite_md.function
+++ b/tests/suites/test_suite_md.function
@@ -4,8 +4,8 @@
 #include <polarssl/md4.h>
 #include <polarssl/md5.h>
 #include <polarssl/sha1.h>
-#include <polarssl/sha2.h>
-#include <polarssl/sha4.h>
+#include <polarssl/sha256.h>
+#include <polarssl/sha512.h>
 END_HEADER
 
 BEGIN_DEPENDENCIES
diff --git a/tests/suites/test_suite_pkcs1_v21.function b/tests/suites/test_suite_pkcs1_v21.function
index b7ff055..57dd341 100644
--- a/tests/suites/test_suite_pkcs1_v21.function
+++ b/tests/suites/test_suite_pkcs1_v21.function
@@ -5,8 +5,8 @@
 #include <polarssl/md4.h>
 #include <polarssl/md5.h>
 #include <polarssl/sha1.h>
-#include <polarssl/sha2.h>
-#include <polarssl/sha4.h>
+#include <polarssl/sha256.h>
+#include <polarssl/sha512.h>
 END_HEADER
 
 BEGIN_DEPENDENCIES
diff --git a/tests/suites/test_suite_rsa.function b/tests/suites/test_suite_rsa.function
index 72c2967..848ef76 100644
--- a/tests/suites/test_suite_rsa.function
+++ b/tests/suites/test_suite_rsa.function
@@ -4,8 +4,8 @@
 #include <polarssl/md4.h>
 #include <polarssl/md5.h>
 #include <polarssl/sha1.h>
-#include <polarssl/sha2.h>
-#include <polarssl/sha4.h>
+#include <polarssl/sha256.h>
+#include <polarssl/sha512.h>
 #include <polarssl/entropy.h>
 #include <polarssl/ctr_drbg.h>
 END_HEADER
diff --git a/tests/suites/test_suite_shax.function b/tests/suites/test_suite_shax.function
index f5efa48..75fad33 100644
--- a/tests/suites/test_suite_shax.function
+++ b/tests/suites/test_suite_shax.function
@@ -1,7 +1,7 @@
 BEGIN_HEADER
 #include <polarssl/sha1.h>
-#include <polarssl/sha2.h>
-#include <polarssl/sha4.h>
+#include <polarssl/sha256.h>
+#include <polarssl/sha512.h>
 END_HEADER
 
 BEGIN_CASE