diff --git a/bindings/python/test_rig.py b/bindings/python/test_rig.py
index 3197b1033..b43dc9c9b 100755
--- a/bindings/python/test_rig.py
+++ b/bindings/python/test_rig.py
@@ -92,15 +92,15 @@ class TestClass:
         assert isinstance(rig.get_channel(channel, Hamlib.RIG_VFO_CURR, readonly), Hamlib.channel)
         assert isinstance(rig.get_conf(""), str)
         assert isinstance(rig.get_ctcss_sql(), int)
-        assert isinstance(rig.get_ctcss_sql(0), int)
+        assert isinstance(rig.get_ctcss_sql(Hamlib.RIG_VFO_CURR), int)
         assert isinstance(rig.get_ctcss_tone(), int)
-        assert isinstance(rig.get_ctcss_tone(0), int)
+        assert isinstance(rig.get_ctcss_tone(Hamlib.RIG_VFO_CURR), int)
         assert isinstance(rig.get_dcd(), int)
-        assert isinstance(rig.get_dcd(Hamlib.RIG_VFO_CURR,), int)
+        assert isinstance(rig.get_dcd(Hamlib.RIG_VFO_CURR), int)
         assert isinstance(rig.get_dcs_code(), int)
-        assert isinstance(rig.get_dcs_code(0), int)
+        assert isinstance(rig.get_dcs_code(Hamlib.RIG_VFO_CURR), int)
         assert isinstance(rig.get_dcs_sql(), int)
-        assert isinstance(rig.get_dcs_sql(0), int)
+        assert isinstance(rig.get_dcs_sql(Hamlib.RIG_VFO_CURR), int)
         assert isinstance(rig.get_ext_func(0), int)
         assert isinstance(rig.get_ext_func(0, 0), int)
         assert rig.get_ext_level(0) is None
@@ -172,11 +172,11 @@ class TestClass:
         channel = Hamlib.channel(0, Hamlib.RIG_VFO_CURR)
         assert rig.set_channel(channel) is None
         assert rig.set_conf("", "") is None
-        assert rig.set_ctcss_sql(0, 0) is None
-        assert rig.set_ctcss_tone(0, 0) is None
-        assert rig.set_dcs_code(0, 0) is None
+        assert rig.set_ctcss_sql(Hamlib.RIG_VFO_CURR, 0) is None
+        assert rig.set_ctcss_tone(Hamlib.RIG_VFO_CURR, 0) is None
+        assert rig.set_dcs_code(Hamlib.RIG_VFO_CURR, 0) is None
         assert rig.set_dcs_sql(0) is None
-        assert rig.set_dcs_sql(0, 0) is None
+        assert rig.set_dcs_sql(0, Hamlib.RIG_VFO_CURR) is None
         assert rig.set_ext_func(0, 0) is None
         assert rig.set_ext_func(0, 0, 0) is None
         level = 0