diff --git a/tests/Makefile.am b/tests/Makefile.am
index 69bcb26..e69337d 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -54,6 +54,10 @@ EXTRA_DIST	 = \
 	config-bad2.xml \
 	config-bad3.xml \
 	config-bad4.xml \
+	play-bad.sh \
+	play-bad2.sh \
+	play-bad3.sh \
+	playlist-bad.txt \
 	playlist.txt
 
 CLEANFILES	 = *~ *.core core *.gcno *.gcda
diff --git a/tests/check_playlist.c b/tests/check_playlist.c
index 864f4ff..6f7303b 100644
--- a/tests/check_playlist.c
+++ b/tests/check_playlist.c
@@ -28,8 +28,18 @@ START_TEST(test_playlist_file)
 	ck_assert_ptr_eq(playlist_get_next(p), NULL);
 	ck_assert_int_eq(playlist_reread(&p), 1);
 	ck_assert_str_eq(playlist_get_next(p), "1.ogg");
+	ck_assert_str_eq(playlist_get_next(p), "2.ogg");
+	ck_assert_str_eq(playlist_get_next(p), "3.ogg");
+	ck_assert_str_eq(playlist_get_next(p), "4.ogg");
+	ck_assert_str_eq(playlist_get_next(p), "5.ogg");
+	ck_assert_ptr_eq(playlist_get_next(p), NULL);
 	playlist_shuffle(p);
 	playlist_free(&p);
+
+	p = playlist_read(SRCDIR "/playlist-bad.txt");
+	ck_assert_ptr_ne(p, NULL);
+	ck_assert_ptr_eq(playlist_get_next(p), NULL);
+	playlist_free(&p);
 }
 END_TEST
 
@@ -39,6 +49,12 @@ START_TEST(test_playlist_program)
 
 	ck_assert_ptr_eq(playlist_program("nonexistent.sh"), NULL);
 	ck_assert_ptr_eq(playlist_program(SRCDIR "/playlist.txt"), NULL);
+
+	p = playlist_program(SRCDIR "/bad-executable.sh");
+	ck_assert_ptr_ne(p, NULL);
+	ck_assert_ptr_eq(playlist_get_next(p), NULL);
+	playlist_free(&p);
+
 	p = playlist_program(EXAMPLESDIR "/play.sh");
 	ck_assert_ptr_ne(p, NULL);
 	ck_assert_str_eq(playlist_get_next(p),
@@ -48,11 +64,37 @@ START_TEST(test_playlist_program)
 	ck_assert_int_eq(playlist_goto_entry(p,
 	    "Great_Artist_-_Great_Song.ogg"), 0);
 	ck_assert_int_eq(playlist_reread(&p), 0);
+	playlist_rewind(p);
+	playlist_shuffle(p);
 	playlist_free(&p);
-	p = playlist_program(SRCDIR "/bad-executable.sh");
+
+	p = playlist_program(SRCDIR "/play-bad.sh");
 	ck_assert_ptr_ne(p, NULL);
 	ck_assert_ptr_eq(playlist_get_next(p), NULL);
 	playlist_free(&p);
+
+	p = playlist_program(SRCDIR "/play-bad2.sh");
+	ck_assert_ptr_ne(p, NULL);
+	ck_assert_ptr_eq(playlist_get_next(p), NULL);
+	playlist_free(&p);
+
+	p = playlist_program(SRCDIR "/play-bad3.sh");
+	ck_assert_ptr_ne(p, NULL);
+	ck_assert_ptr_eq(playlist_get_next(p), NULL);
+	playlist_free(&p);
+}
+END_TEST
+
+START_TEST(test_playlist_free)
+{
+	playlist_t	p;
+
+	p = playlist_read(SRCDIR "/playlist.txt");
+	ck_assert_ptr_ne(p, NULL);
+	playlist_free(&p);
+	ck_assert_ptr_eq(p, NULL);
+	playlist_free(&p);
+	playlist_free(NULL);
 }
 END_TEST
 
@@ -68,6 +110,7 @@ playlist_suite(void)
 	tcase_add_checked_fixture(tc_playlist, setup_checked, teardown_checked);
 	tcase_add_test(tc_playlist, test_playlist_file);
 	tcase_add_test(tc_playlist, test_playlist_program);
+	tcase_add_test(tc_playlist, test_playlist_free);
 	suite_add_tcase(s, tc_playlist);
 
 	return (s);
diff --git a/tests/play-bad.sh b/tests/play-bad.sh
new file mode 100755
index 0000000..6c9fe3f
--- /dev/null
+++ b/tests/play-bad.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+echo "$(cat playlist-bad.txt)"
diff --git a/tests/play-bad2.sh b/tests/play-bad2.sh
new file mode 100755
index 0000000..c822704
--- /dev/null
+++ b/tests/play-bad2.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+echo ""
diff --git a/tests/play-bad3.sh b/tests/play-bad3.sh
new file mode 100755
index 0000000..c52d3c2
--- /dev/null
+++ b/tests/play-bad3.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exit 0
diff --git a/tests/playlist-bad.txt b/tests/playlist-bad.txt
new file mode 100644
index 0000000..1fe2898
--- /dev/null
+++ b/tests/playlist-bad.txt
@@ -0,0 +1 @@
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
\ No newline at end of file
diff --git a/tests/playlist.txt b/tests/playlist.txt
index f05d59f..cb82794 100644
--- a/tests/playlist.txt
+++ b/tests/playlist.txt
@@ -1,5 +1,7 @@
 1.ogg
+
 2.ogg
+# This is a comment
 3.ogg
 4.ogg
 5.ogg