diff --git a/test-tool/test_startstopunit_noloej.c b/test-tool/test_startstopunit_noloej.c
index 48b6d00..3bf3470 100644
--- a/test-tool/test_startstopunit_noloej.c
+++ b/test-tool/test_startstopunit_noloej.c
@@ -43,7 +43,7 @@ test_startstopunit_noloej(void)
 
         logging(LOG_VERBOSE, "Test TESTUNITREADY that medium is not ejected.");
         TESTUNITREADY(sd,
-                      EXPECT_SANITIZE);
+                      EXPECT_STATUS_GOOD);
 
         logging(LOG_VERBOSE, "Test that media is not ejected when LOEJ==0 IMMED==0 NO_FLUSH==0 START==1");
         STARTSTOPUNIT(sd, 0, 0, 0, 0, 0, 1,
@@ -51,7 +51,7 @@ test_startstopunit_noloej(void)
 
         logging(LOG_VERBOSE, "Test TESTUNITREADY that medium is not ejected.");
         TESTUNITREADY(sd,
-                      EXPECT_SANITIZE);
+                      EXPECT_STATUS_GOOD);
 
         logging(LOG_VERBOSE, "Test that media is not ejected when LOEJ==0 IMMED==1 NO_FLUSH==0 START==0");
         STARTSTOPUNIT(sd, 1, 0, 0, 0, 0, 0,
@@ -59,7 +59,7 @@ test_startstopunit_noloej(void)
 
         logging(LOG_VERBOSE, "Test TESTUNITREADY that medium is not ejected.");
         TESTUNITREADY(sd,
-                      EXPECT_SANITIZE);
+                      EXPECT_STATUS_GOOD);
 
         logging(LOG_VERBOSE, "Test that media is not ejected when LOEJ==0 IMMED==1 NO_FLUSH==0 START==1");
         STARTSTOPUNIT(sd, 1, 0, 0, 0, 0, 1,
@@ -67,7 +67,7 @@ test_startstopunit_noloej(void)
 
         logging(LOG_VERBOSE, "Test TESTUNITREADY that medium is not ejected.");
         TESTUNITREADY(sd,
-                      EXPECT_SANITIZE);
+                      EXPECT_STATUS_GOOD);
 
         logging(LOG_VERBOSE, "Test that media is not ejected when LOEJ==0 IMMED==0 NO_FLUSH==1 START==0");
         STARTSTOPUNIT(sd, 0, 0, 0, 1, 0, 0,
@@ -75,7 +75,7 @@ test_startstopunit_noloej(void)
 
         logging(LOG_VERBOSE, "Test TESTUNITREADY that medium is not ejected.");
         TESTUNITREADY(sd,
-                      EXPECT_SANITIZE);
+                      EXPECT_STATUS_GOOD);
 
         logging(LOG_VERBOSE, "Test that media is not ejected when LOEJ==0 IMMED==0 NO_FLUSH==1 START==1");
         STARTSTOPUNIT(sd, 0, 0, 0, 1, 0, 1,
@@ -83,7 +83,7 @@ test_startstopunit_noloej(void)
 
         logging(LOG_VERBOSE, "Test TESTUNITREADY that medium is not ejected.");
         TESTUNITREADY(sd,
-                      EXPECT_SANITIZE);
+                      EXPECT_STATUS_GOOD);
 
         logging(LOG_VERBOSE, "Test that media is not ejected when LOEJ==0 IMMED==1 NO_FLUSH==1 START==0");
         STARTSTOPUNIT(sd, 1, 0, 0, 1, 0, 0,
@@ -91,7 +91,7 @@ test_startstopunit_noloej(void)
 
         logging(LOG_VERBOSE, "Test TESTUNITREADY that medium is not ejected.");
         TESTUNITREADY(sd,
-                      EXPECT_SANITIZE);
+                      EXPECT_STATUS_GOOD);
 
         logging(LOG_VERBOSE, "Test that media is not ejected when LOEJ==0 IMMED==1 NO_FLUSH==1 START==1");
         STARTSTOPUNIT(sd, 1, 0, 0, 1, 0, 1,
@@ -99,7 +99,7 @@ test_startstopunit_noloej(void)
 
         logging(LOG_VERBOSE, "Test TESTUNITREADY that medium is not ejected.");
         TESTUNITREADY(sd,
-                      EXPECT_SANITIZE);
+                      EXPECT_STATUS_GOOD);
 
         logging(LOG_VERBOSE, "In case the target did eject the medium, load it again.");
         STARTSTOPUNIT(sd, 1, 0, 0, 0, 1, 1,
diff --git a/test-tool/test_startstopunit_pwrcnd.c b/test-tool/test_startstopunit_pwrcnd.c
index be72c71..5c4722b 100644
--- a/test-tool/test_startstopunit_pwrcnd.c
+++ b/test-tool/test_startstopunit_pwrcnd.c
@@ -46,7 +46,7 @@ test_startstopunit_pwrcnd(void)
 
                 logging(LOG_VERBOSE, "Test TESTUNITREADY that medium is not ejected.");
                 TESTUNITREADY(sd,
-                              EXPECT_SANITIZE);
+                              EXPECT_STATUS_GOOD);
         }
 
         logging(LOG_VERBOSE, "In case the target did eject the medium, load it again.");
diff --git a/test-tool/test_startstopunit_simple.c b/test-tool/test_startstopunit_simple.c
index 66cbd7f..db5922a 100644
--- a/test-tool/test_startstopunit_simple.c
+++ b/test-tool/test_startstopunit_simple.c
@@ -61,7 +61,7 @@ test_startstopunit_simple(void)
 
         logging(LOG_VERBOSE, "Verify we can read from the media.");
         TESTUNITREADY(sd,
-                      EXPECT_SANITIZE);
+                      EXPECT_STATUS_GOOD);
 
         logging(LOG_VERBOSE, "Test we can eject removable the media with IMMED==1");
         STARTSTOPUNIT(sd, 0, 0, 0, 0, 1, 0,
@@ -78,5 +78,5 @@ test_startstopunit_simple(void)
 
         logging(LOG_VERBOSE, "Verify we can access the media again.");
         TESTUNITREADY(sd,
-                      EXPECT_SANITIZE);
+                      EXPECT_STATUS_GOOD);
 }