diff --git a/python/samba/tests/krb5/as_req_tests.py b/python/samba/tests/krb5/as_req_tests.py
index 861d2371b75..ed97a10b616 100755
--- a/python/samba/tests/krb5/as_req_tests.py
+++ b/python/samba/tests/krb5/as_req_tests.py
@@ -99,10 +99,10 @@ class AsReqKerberosTests(KDCBaseTest):
             check_rep_fn=self.generic_check_kdc_rep,
             expected_error_mode=expected_error_mode,
             client_as_etypes=client_as_etypes,
-            expected_salt=expected_salt)
+            expected_salt=expected_salt,
+            kdc_options=str(initial_kdc_options))
 
         rep = self._generic_kdc_exchange(kdc_exchange_dict,
-                                         kdc_options=str(initial_kdc_options),
                                          cname=cname,
                                          realm=realm,
                                          sname=sname,
diff --git a/python/samba/tests/krb5/raw_testcase.py b/python/samba/tests/krb5/raw_testcase.py
index 5579e989d1c..00f90c5dea9 100644
--- a/python/samba/tests/krb5/raw_testcase.py
+++ b/python/samba/tests/krb5/raw_testcase.py
@@ -1431,7 +1431,6 @@ class RawKerberosTest(TestCaseInTempDir):
 
     def _generic_kdc_exchange(self,
                               kdc_exchange_dict,  # required
-                              kdc_options=None,  # required
                               cname=None,  # optional
                               realm=None,  # required
                               sname=None,  # optional
@@ -1454,6 +1453,8 @@ class RawKerberosTest(TestCaseInTempDir):
         req_asn1Spec = kdc_exchange_dict['req_asn1Spec']
         rep_msg_type = kdc_exchange_dict['rep_msg_type']
 
+        kdc_options = kdc_exchange_dict['kdc_options']
+
         if till_time is None:
             till_time = self.get_KerberosTime(offset=36000)
         if nonce is None:
@@ -1524,7 +1525,8 @@ class RawKerberosTest(TestCaseInTempDir):
                          callback_dict=None,
                          expected_error_mode=0,
                          client_as_etypes=None,
-                         expected_salt=None):
+                         expected_salt=None,
+                         kdc_options=''):
         kdc_exchange_dict = {
             'req_msg_type': KRB_AS_REQ,
             'req_asn1Spec': krb5_asn1.AS_REQ,
@@ -1545,6 +1547,7 @@ class RawKerberosTest(TestCaseInTempDir):
             'expected_error_mode': expected_error_mode,
             'client_as_etypes': client_as_etypes,
             'expected_salt': expected_salt,
+            'kdc_options': kdc_options,
         }
         if callback_dict is None:
             callback_dict = {}
@@ -1565,7 +1568,8 @@ class RawKerberosTest(TestCaseInTempDir):
                           callback_dict=None,
                           tgt=None,
                           authenticator_subkey=None,
-                          body_checksum_type=None):
+                          body_checksum_type=None,
+                          kdc_options=''):
         kdc_exchange_dict = {
             'req_msg_type': KRB_TGS_REQ,
             'req_asn1Spec': krb5_asn1.TGS_REQ,
@@ -1586,6 +1590,7 @@ class RawKerberosTest(TestCaseInTempDir):
             'tgt': tgt,
             'body_checksum_type': body_checksum_type,
             'authenticator_subkey': authenticator_subkey,
+            'kdc_options': kdc_options
         }
         if callback_dict is None:
             callback_dict = {}
@@ -2047,10 +2052,10 @@ class RawKerberosTest(TestCaseInTempDir):
             check_kdc_private_fn=self.generic_check_kdc_private,
             expected_error_mode=expected_error_mode,
             client_as_etypes=client_as_etypes,
-            expected_salt=expected_salt)
+            expected_salt=expected_salt,
+            kdc_options=str(kdc_options))
 
         rep = self._generic_kdc_exchange(kdc_exchange_dict,
-                                         kdc_options=str(kdc_options),
                                          cname=cname,
                                          realm=realm,
                                          sname=sname,