diff --git a/testsuite/expect/test30.1 b/testsuite/expect/test30.1
index 0fbff27893eba2e00949099868a34123d514ba1e..e7ea775a758db7bb0eb11419a6cc7480674051a6 100755
--- a/testsuite/expect/test30.1
+++ b/testsuite/expect/test30.1
@@ -121,6 +121,24 @@ expect {
 		set build_match 1
 		exp_continue
 	}
+	-re "\nerror: db5 error" {
+		send_user "\nWARNING: No installed RPM database on this system.\n"
+		exp_continue
+	}
+	-re "\nerror: cannot open Packages" {
+		send_user "\nWARNING: No installed RPM database on this system.\n"
+		exp_continue
+	}
+	-re "\nerror: " {
+		send_user "\nFAILURE: There was an error during the RPM build.\n"
+		set exit_code 1
+		exp_continue
+	}
+	-re "\nwarning: " {
+		send_user "\nFAILURE: There was a warning during the RPM build.\n"
+		set exit_code 1
+		exp_continue
+	}
 	timeout {
 		send_user "\nFAILURE: rpmbuild is not responding\n"
 		set exit_code 1
@@ -147,12 +165,30 @@ exec $bin_rm -fr /tmp/built_rpm
 
 set build_match 0
 spawn rpmbuild -ta -v $tar_name --define=$prefix_loc --define=$lib_dir \
---define=$topdir --define=$man_dir --define=$data_dir --define=$bin_dir --nodeps
+    --define=$topdir --define=$man_dir --define=$data_dir --define=$bin_dir --nodeps
 expect {
 	-re "Wrote" {
 		set build_match 1
 		exp_continue
 	}
+	-re "\nerror: db5 error" {
+		send_user "\nWARNING: No installed RPM database on this system.\n"
+		exp_continue
+	}
+	-re "\nerror: cannot open Packages" {
+		send_user "\nWARNING: No installed RPM database on this system.\n"
+		exp_continue
+	}
+	-re "\nerror: " {
+		send_user "\nFAILURE: There was an error during the RPM build.\n"
+		set exit_code 1
+		exp_continue
+	}
+	-re "\nwarning: " {
+		send_user "\nFAILURE: There was a warning during the RPM build.\n"
+		set exit_code 1
+		exp_continue
+	}
 	timeout {
 		send_user "\nFAILURE: rpmbuild is not responding\n"
 		set exit_code 1