diff --git a/tests/Makefile b/tests/Makefile
index 9f84e7f..23455a6 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -43,7 +43,7 @@
 		test_suite_gcm.aes128_en						\
 		test_suite_gcm.aes192_en						\
 		test_suite_gcm.aes256_en						\
-		test_suite_hmac_shax							\
+		test_suite_gcm.camellia	test_suite_hmac_shax	\
 		test_suite_md			test_suite_mdx			\
 		test_suite_mpi			test_suite_pbkdf2		\
 		test_suite_pkcs1_v21	test_suite_pkcs5		\
@@ -128,6 +128,10 @@
 	echo   "  Generate	$@"
 	scripts/generate_code.pl suites test_suite_gcm test_suite_gcm.aes256_en
 
+test_suite_gcm.camellia.c : suites/test_suite_gcm.function suites/test_suite_gcm.camellia.data scripts/generate_code.pl suites/helpers.function suites/main_test.function
+	echo   "  Generate	$@"
+	scripts/generate_code.pl suites test_suite_gcm test_suite_gcm.camellia
+
 %.c : suites/%.function suites/%.data scripts/generate_code.pl suites/helpers.function suites/main_test.function
 	echo   "  Generate	$@"
 	scripts/generate_code.pl suites $* $*
@@ -248,6 +252,10 @@
 	echo   "  CC    	$@.c"
 	$(CC) $(CFLAGS) $(OFLAGS) $@.c	$(LDFLAGS) -o $@
 
+test_suite_gcm.camellia: test_suite_gcm.camellia.c ../library/libpolarssl.a
+	echo   "  CC    	$@.c"
+	$(CC) $(CFLAGS) $(OFLAGS) $@.c	$(LDFLAGS) -o $@
+
 test_suite_hmac_shax: test_suite_hmac_shax.c ../library/libpolarssl.a
 	echo   "  CC    	$@.c"
 	$(CC) $(CFLAGS) $(OFLAGS) $@.c	$(LDFLAGS) -o $@