diff --git a/tests/rigctl.c b/tests/rigctl.c
index d0ec7f397..68ca777de 100644
--- a/tests/rigctl.c
+++ b/tests/rigctl.c
@@ -23,6 +23,8 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
  */
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
 #include <hamlib/config.h>
 
 #include <stdio.h>
@@ -603,7 +605,7 @@ int main(int argc, char *argv[])
 
     if (dcd_type != RIG_DCD_NONE)
     {
-        my_rig->state.dcdport.type.dcd = dcd_type;
+        DCDPORT(my_rig)->type.dcd = dcd_type;
     }
 
     if (ptt_file)
@@ -613,7 +615,7 @@ int main(int argc, char *argv[])
 
     if (dcd_file)
     {
-        strncpy(my_rig->state.dcdport.pathname, dcd_file, HAMLIB_FILPATHLEN - 1);
+        strncpy(DCDPORT(my_rig)->pathname, dcd_file, HAMLIB_FILPATHLEN - 1);
     }
 
     /* FIXME: bound checking and port type == serial */
diff --git a/tests/rigctlcom.c b/tests/rigctlcom.c
index b81f03a97..023952baa 100644
--- a/tests/rigctlcom.c
+++ b/tests/rigctlcom.c
@@ -26,6 +26,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
  */
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 
 #include <hamlib/config.h>
 
@@ -530,7 +531,7 @@ int main(int argc, char *argv[])
 
     if (dcd_type != RIG_DCD_NONE)
     {
-        my_rig->state.dcdport.type.dcd = dcd_type;
+        DCDPORT(my_rig)->type.dcd = dcd_type;
     }
 
     if (ptt_file)
@@ -540,7 +541,7 @@ int main(int argc, char *argv[])
 
     if (dcd_file)
     {
-        strncpy(my_rig->state.dcdport.pathname, dcd_file, HAMLIB_FILPATHLEN - 1);
+        strncpy(DCDPORT(my_rig)->pathname, dcd_file, HAMLIB_FILPATHLEN - 1);
     }
 
     /* FIXME: bound checking and port type == serial */
diff --git a/tests/rigctld.c b/tests/rigctld.c
index c209b1032..8bb183839 100644
--- a/tests/rigctld.c
+++ b/tests/rigctld.c
@@ -22,6 +22,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
  */
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 
 #include <hamlib/config.h>
 
@@ -714,7 +715,7 @@ int main(int argc, char *argv[])
 
     if (dcd_type != RIG_DCD_NONE)
     {
-        my_rig->state.dcdport.type.dcd = dcd_type;
+        DCDPORT(my_rig)->type.dcd = dcd_type;
         my_rig->state.dcdport_deprecated.type.dcd = dcd_type;
     }
 
@@ -727,7 +728,7 @@ int main(int argc, char *argv[])
 
     if (dcd_file)
     {
-        strncpy(my_rig->state.dcdport.pathname, dcd_file, HAMLIB_FILPATHLEN - 1);
+        strncpy(DCDPORT(my_rig)->pathname, dcd_file, HAMLIB_FILPATHLEN - 1);
         strncpy(my_rig->state.dcdport_deprecated.pathname, dcd_file,
                 HAMLIB_FILPATHLEN - 1);
     }
diff --git a/tests/rigctlsync.c b/tests/rigctlsync.c
index 525b0d98b..54d287cd9 100644
--- a/tests/rigctlsync.c
+++ b/tests/rigctlsync.c
@@ -23,6 +23,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
  */
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 
 #include <hamlib/config.h>
 
@@ -557,7 +558,7 @@ int main(int argc, char *argv[])
 
     if (dcd_type != RIG_DCD_NONE)
     {
-        my_rig->state.dcdport.type.dcd = dcd_type;
+        DCDPORT(my_rig)->type.dcd = dcd_type;
     }
 
     if (ptt_file)
@@ -567,7 +568,7 @@ int main(int argc, char *argv[])
 
     if (dcd_file)
     {
-        strncpy(my_rig->state.dcdport.pathname, dcd_file, HAMLIB_FILPATHLEN - 1);
+        strncpy(DCDPORT(my_rig)->pathname, dcd_file, HAMLIB_FILPATHLEN - 1);
     }
 
 #endif
diff --git a/tests/rigctltcp.c b/tests/rigctltcp.c
index 207de3a19..51e71ff7c 100644
--- a/tests/rigctltcp.c
+++ b/tests/rigctltcp.c
@@ -22,6 +22,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
  */
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 
 #include <hamlib/config.h>
 
@@ -709,7 +710,7 @@ int main(int argc, char *argv[])
 
     if (dcd_type != RIG_DCD_NONE)
     {
-        my_rig->state.dcdport.type.dcd = dcd_type;
+        DCDPORT(my_rig)->type.dcd = dcd_type;
         my_rig->state.dcdport_deprecated.type.dcd = dcd_type;
     }
 
@@ -722,7 +723,7 @@ int main(int argc, char *argv[])
 
     if (dcd_file)
     {
-        strncpy(my_rig->state.dcdport.pathname, dcd_file, HAMLIB_FILPATHLEN - 1);
+        strncpy(DCDPORT(my_rig)->pathname, dcd_file, HAMLIB_FILPATHLEN - 1);
         strncpy(my_rig->state.dcdport_deprecated.pathname, dcd_file,
                 HAMLIB_FILPATHLEN - 1);
     }