diff --git a/tests/.gitignore b/tests/.gitignore
index 0d59058..dc17f87 100644
--- a/tests/.gitignore
+++ b/tests/.gitignore
@@ -1,2 +1,3 @@
 /test_suite*
 data_files/mpi_write
+data_files/hmac_drbg_seed
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 858e429..a24ef25 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -63,6 +63,7 @@
 add_test_suite(gcm gcm.aes192_de)
 add_test_suite(gcm gcm.aes256_de)
 add_test_suite(gcm gcm.camellia)
+add_test_suite(hmac_drbg hmac_drbg.misc)
 add_test_suite(hmac_drbg hmac_drbg.no_reseed)
 add_test_suite(hmac_shax)
 add_test_suite(md)
diff --git a/tests/Makefile b/tests/Makefile
index f32a4e6..0e56e7f 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -44,6 +44,7 @@
 		test_suite_gcm.aes192_en						\
 		test_suite_gcm.aes256_en						\
 		test_suite_gcm.camellia	test_suite_hmac_shax	\
+		test_suite_hmac_drbg.misc						\
 		test_suite_hmac_drbg.no_reseed					\
 		test_suite_md			test_suite_mdx			\
 		test_suite_mpi			test_suite_pbkdf2		\
@@ -134,6 +135,10 @@
 	echo   "  Generate	$@"
 	scripts/generate_code.pl suites test_suite_gcm test_suite_gcm.camellia
 
+test_suite_hmac_drbg.misc.c : suites/test_suite_hmac_drbg.function suites/test_suite_hmac_drbg.misc.data scripts/generate_code.pl suites/helpers.function suites/main_test.function
+	echo   "  Generate	$@"
+	scripts/generate_code.pl suites test_suite_hmac_drbg test_suite_hmac_drbg.misc
+
 test_suite_hmac_drbg.no_reseed.c : suites/test_suite_hmac_drbg.function suites/test_suite_hmac_drbg.no_reseed.data scripts/generate_code.pl suites/helpers.function suites/main_test.function
 	echo   "  Generate	$@"
 	scripts/generate_code.pl suites test_suite_hmac_drbg test_suite_hmac_drbg.no_reseed
@@ -262,6 +267,10 @@
 	echo   "  CC    	$@.c"
 	$(CC) $(CFLAGS) $(OFLAGS) $@.c	$(LDFLAGS) -o $@
 
+test_suite_hmac_drbg.misc: test_suite_hmac_drbg.misc.c ../library/libpolarssl.a
+	echo   "  CC    	$@.c"
+	$(CC) $(CFLAGS) $(OFLAGS) $@.c	$(LDFLAGS) -o $@
+
 test_suite_hmac_drbg.no_reseed: test_suite_hmac_drbg.no_reseed.c ../library/libpolarssl.a
 	echo   "  CC    	$@.c"
 	$(CC) $(CFLAGS) $(OFLAGS) $@.c	$(LDFLAGS) -o $@
diff --git a/tests/suites/test_suite_hmac_drbg.function b/tests/suites/test_suite_hmac_drbg.function
index a95beb2..09e55b7 100644
--- a/tests/suites/test_suite_hmac_drbg.function
+++ b/tests/suites/test_suite_hmac_drbg.function
@@ -28,6 +28,23 @@
  * END_DEPENDENCIES
  */
 
+/* BEGIN_CASE depends_on:POLARSSL_FS_IO */
+void hmac_drbg_seed_file( int md_alg, char *path, int ret )
+{
+    const md_info_t *md_info;
+    hmac_drbg_context ctx;
+
+    TEST_ASSERT( ( md_info = md_info_from_type( md_alg ) ) != NULL );
+    TEST_ASSERT( hmac_drbg_init( &ctx, md_info, rnd_std_rand, NULL,
+                                 NULL, 0 ) == 0 );
+
+    TEST_ASSERT( hmac_drbg_write_seed_file( &ctx, path ) == ret );
+    TEST_ASSERT( hmac_drbg_update_seed_file( &ctx, path ) == ret );
+
+    hmac_drbg_free( &ctx );
+}
+/* END_CASE */
+
 /* BEGIN_CASE */
 void hmac_drbg_no_reseed( int md_alg,
                           char *entropy_hex, char *custom_hex,
diff --git a/tests/suites/test_suite_hmac_drbg.misc.data b/tests/suites/test_suite_hmac_drbg.misc.data
new file mode 100644
index 0000000..b88bcc4
--- /dev/null
+++ b/tests/suites/test_suite_hmac_drbg.misc.data
@@ -0,0 +1,40 @@
+HMAC_DRBG write/update seed file SHA-1
+depends_on:POLARSSL_SHA1_C
+hmac_drbg_seed_file:POLARSSL_MD_SHA1:"data_files/hmac_drbg_seed":0
+
+HMAC_DRBG write/update seed file SHA-1
+depends_on:POLARSSL_SHA1_C
+hmac_drbg_seed_file:POLARSSL_MD_SHA1:"no_such_dir/file":POLARSSL_ERR_HMAC_DRBG_FILE_IO_ERROR
+
+HMAC_DRBG write/update seed file SHA-224
+depends_on:POLARSSL_SHA256_C
+hmac_drbg_seed_file:POLARSSL_MD_SHA224:"data_files/hmac_drbg_seed":0
+
+HMAC_DRBG write/update seed file SHA-224
+depends_on:POLARSSL_SHA256_C
+hmac_drbg_seed_file:POLARSSL_MD_SHA224:"no_such_dir/file":POLARSSL_ERR_HMAC_DRBG_FILE_IO_ERROR
+
+HMAC_DRBG write/update seed file SHA-256
+depends_on:POLARSSL_SHA256_C
+hmac_drbg_seed_file:POLARSSL_MD_SHA256:"data_files/hmac_drbg_seed":0
+
+HMAC_DRBG write/update seed file SHA-256
+depends_on:POLARSSL_SHA256_C
+hmac_drbg_seed_file:POLARSSL_MD_SHA256:"no_such_dir/file":POLARSSL_ERR_HMAC_DRBG_FILE_IO_ERROR
+
+HMAC_DRBG write/update seed file SHA-384
+depends_on:POLARSSL_SHA512_C
+hmac_drbg_seed_file:POLARSSL_MD_SHA384:"data_files/hmac_drbg_seed":0
+
+HMAC_DRBG write/update seed file SHA-384
+depends_on:POLARSSL_SHA512_C
+hmac_drbg_seed_file:POLARSSL_MD_SHA384:"no_such_dir/file":POLARSSL_ERR_HMAC_DRBG_FILE_IO_ERROR
+
+HMAC_DRBG write/update seed file SHA-512
+depends_on:POLARSSL_SHA512_C
+hmac_drbg_seed_file:POLARSSL_MD_SHA512:"data_files/hmac_drbg_seed":0
+
+HMAC_DRBG write/update seed file SHA-512
+depends_on:POLARSSL_SHA512_C
+hmac_drbg_seed_file:POLARSSL_MD_SHA512:"no_such_dir/file":POLARSSL_ERR_HMAC_DRBG_FILE_IO_ERROR
+