diff --git a/src/tests/add-ons/kernel/file_systems/cdda/Jamfile b/src/tests/add-ons/kernel/file_systems/cdda/Jamfile
index 75ee89ac8d..bdbf993baa 100644
--- a/src/tests/add-ons/kernel/file_systems/cdda/Jamfile
+++ b/src/tests/add-ons/kernel/file_systems/cdda/Jamfile
@@ -1,6 +1,7 @@
 SubDir HAIKU_TOP src tests add-ons kernel file_systems cdda ;
 
 SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons kernel file_systems cdda ] ;
+UsePrivateHeaders drivers ;
 
 SimpleTest cdda_text
 	:
diff --git a/src/tests/add-ons/kernel/file_systems/cdda/cdda_text.cpp b/src/tests/add-ons/kernel/file_systems/cdda/cdda_text.cpp
index 79f923cbe5..a8839b0917 100644
--- a/src/tests/add-ons/kernel/file_systems/cdda/cdda_text.cpp
+++ b/src/tests/add-ons/kernel/file_systems/cdda/cdda_text.cpp
@@ -1,17 +1,18 @@
 /*
- * Copyright 2007, Axel Dörfler, axeld@pinc-software.de.
+ * Copyright 2007-2010, Axel Dörfler, axeld@pinc-software.de.
  * Distributed under the terms of the MIT License.
  */
 
 
-#include "cdda.h"
-#include "cddb.h"
-
 #include <fcntl.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <unistd.h>
 
+#include "cdda.h"
+#include "cddb.h"
+
 
 extern const char* __progname;
 
@@ -46,8 +47,11 @@ main(int argc, char** argv)
 
 	uint8 buffer[1024];
 	scsi_toc_toc *toc = (scsi_toc_toc *)buffer;
-	if (read_table_of_contents(fd, toc, sizeof(buffer)) < 0) {
-		fprintf(stderr, "%s: Retrieving TOC failed", __progname);
+
+	status_t status = read_table_of_contents(fd, toc, sizeof(buffer));
+	if (status != B_OK) {
+		fprintf(stderr, "%s: Retrieving TOC failed: %s\n", __progname,
+			strerror(status));
 		return -1;
 	}