diff --git a/scp.c b/scp.c
index 76044553..f71ec3d3 100644
--- a/scp.c
+++ b/scp.c
@@ -16356,20 +16356,20 @@ for (i = 0; (dptr = sim_devices[i]) != NULL; i++) {
         switch (DEV_TYPE(dptr)) {
 #if defined(USE_SIM_CARD)
             case DEV_CARD:
-                tstat = sim_card_test (dptr);
+                tstat = sim_card_test (dptr, cptr);
                 break;
 #endif
             case DEV_DISK:
-                tstat = sim_disk_test (dptr);
+                tstat = sim_disk_test (dptr, cptr);
                 break;
             case DEV_ETHER:
-                tstat = sim_ether_test (dptr);
+                tstat = sim_ether_test (dptr, cptr);
                 break;
             case DEV_TAPE:
-                tstat = sim_tape_test (dptr);
+                tstat = sim_tape_test (dptr, cptr);
                 break;
             case DEV_MUX:
-                tstat = tmxr_sock_test (dptr);
+                tstat = tmxr_sock_test (dptr, cptr);
                 break;
             default:
                 break;
diff --git a/sim_card.c b/sim_card.c
index 16a31bff..c0fcfabb 100644
--- a/sim_card.c
+++ b/sim_card.c
@@ -1470,7 +1470,7 @@ return SCPE_OK;
 
 #include <setjmp.h>
 
-t_stat sim_card_test (DEVICE *dptr)
+t_stat sim_card_test (DEVICE *dptr, const char *cptr)
 {
 t_stat stat = SCPE_OK;
 #if defined(USE_SIM_CARD) && defined(SIM_CARD_API) && (SIM_MAJOR > 3)
@@ -1536,7 +1536,7 @@ t_stat sim_card_attach_help(FILE *st, DEVICE *dptr, UNIT *uptr, int32 flag, cons
     return SCPE_OK;
 }
 
-t_stat sim_card_test (DEVICE *dptr)
+t_stat sim_card_test (DEVICE *dptr, const char *cptr)
 {
     return SCPE_OK;
 }
diff --git a/sim_card.h b/sim_card.h
index 6f1b3e6c..1a388fb4 100644
--- a/sim_card.h
+++ b/sim_card.h
@@ -145,7 +145,7 @@ extern const char      sim_ascii_to_six[128];       /* Map 7 bit ASCII to BCD */
 extern const uint8     sim_parity_table[64];        /* 64 entry odd parity table */
 
 /* Unit test routine */
-extern t_stat sim_card_test (DEVICE *dptr);
+extern t_stat sim_card_test (DEVICE *dptr, const char *cptr);
 
 #ifdef  __cplusplus
 }
diff --git a/sim_disk.c b/sim_disk.c
index 1b271381..ada7b56a 100644
--- a/sim_disk.c
+++ b/sim_disk.c
@@ -6408,7 +6408,7 @@ if (r == SCPE_OK) {
 return r;
 }
 
-t_stat sim_disk_test (DEVICE *dptr)
+t_stat sim_disk_test (DEVICE *dptr, const char *cptr)
 {
 const char *fmt[] = {"RAW", "VHD", "VHD", "SIMH", NULL};
 uint32 sect_size[] = {576, 4096, 1024, 512, 256, 128, 64, 0};
diff --git a/sim_disk.h b/sim_disk.h
index c18ceb4b..ab352694 100644
--- a/sim_disk.h
+++ b/sim_disk.h
@@ -114,7 +114,7 @@ t_bool sim_disk_vhd_support (void);
 t_bool sim_disk_raw_support (void);
 void sim_disk_data_trace (UNIT *uptr, const uint8 *data, size_t lba, size_t len, const char* txt, int detail, uint32 reason);
 t_stat sim_disk_info_cmd (int32 flag, CONST char *ptr);
-t_stat sim_disk_test (DEVICE *dptr);
+t_stat sim_disk_test (DEVICE *dptr, const char *cptr);
 
 #ifdef  __cplusplus
 }
diff --git a/sim_ether.c b/sim_ether.c
index 5c29f6e7..e99ea2e0 100644
--- a/sim_ether.c
+++ b/sim_ether.c
@@ -4472,7 +4472,7 @@ return (errors == 0) ? SCPE_OK : SCPE_IERR;
 
 #include <setjmp.h>
 
-t_stat sim_ether_test (DEVICE *dptr)
+t_stat sim_ether_test (DEVICE *dptr, const char *cptr)
 {
 t_stat stat = SCPE_OK;
 SIM_TEST_INIT;
diff --git a/sim_ether.h b/sim_ether.h
index f912ae3c..04e41d9c 100644
--- a/sim_ether.h
+++ b/sim_ether.h
@@ -387,7 +387,7 @@ void ethq_insert_data(ETH_QUE* que, int32 type,         /* insert item into FIFO
                   size_t crc_len, const uint8 *crc_data, int32 status);
 t_stat ethq_destroy(ETH_QUE* que);                      /* release FIFO queue */
 const char *eth_capabilities(void);
-t_stat sim_ether_test (DEVICE *dptr);                   /* unit test routine */
+t_stat sim_ether_test (DEVICE *dptr, const char *cptr); /* unit test routine */
 
 #if !defined(SIM_TEST_INIT)     /* Need stubs for test APIs */
 #define SIM_TEST_INIT
diff --git a/sim_tape.c b/sim_tape.c
index 6c4866c1..6f38a99c 100644
--- a/sim_tape.c
+++ b/sim_tape.c
@@ -4292,7 +4292,7 @@ return SCPE_OK;
 
 #include <setjmp.h>
 
-t_stat sim_tape_test (DEVICE *dptr)
+t_stat sim_tape_test (DEVICE *dptr, const char *cptr)
 {
 int32 saved_switches = sim_switches;
 SIM_TEST_INIT;
diff --git a/sim_tape.h b/sim_tape.h
index 2476609d..aae5bf3c 100644
--- a/sim_tape.h
+++ b/sim_tape.h
@@ -233,7 +233,7 @@ t_stat sim_tape_show_dens (FILE *st, UNIT *uptr, int32 val, CONST void *desc);
 t_stat sim_tape_density_supported (char *string, size_t string_size, int32 valid_bits);
 t_stat sim_tape_set_asynch (UNIT *uptr, int latency);
 t_stat sim_tape_clr_asynch (UNIT *uptr);
-t_stat sim_tape_test (DEVICE *dptr);
+t_stat sim_tape_test (DEVICE *dptr, const char *cptr);
 t_stat sim_tape_add_debug (DEVICE *dptr);
 
 #ifdef  __cplusplus
diff --git a/sim_tmxr.c b/sim_tmxr.c
index 40d8327c..a6677772 100644
--- a/sim_tmxr.c
+++ b/sim_tmxr.c
@@ -6141,7 +6141,7 @@ return SCPE_OK;
 
 #include <setjmp.h>
 
-t_stat tmxr_sock_test (DEVICE *dptr)
+t_stat tmxr_sock_test (DEVICE *dptr, const char *cptr)
 {
 char cmd[CBUFSIZE], host[CBUFSIZE], port[CBUFSIZE];
 int line;
diff --git a/sim_tmxr.h b/sim_tmxr.h
index feb0f61a..9202f2ab 100644
--- a/sim_tmxr.h
+++ b/sim_tmxr.h
@@ -325,7 +325,7 @@ const char *tmxr_send_line_name (const SEND *snd);
 const char *tmxr_expect_line_name (const EXPECT *exp);
 t_stat tmxr_startup (void);
 t_stat tmxr_shutdown (void);
-t_stat tmxr_sock_test (DEVICE *dptr);
+t_stat tmxr_sock_test (DEVICE *dptr, const char *cptr);
 t_stat tmxr_start_poll (void);
 t_stat tmxr_stop_poll (void);
 /* Framer support.  These are a NOP if called on a non-framer line. */