diff --git a/roles/ipaclient/library/ipaclient_test.py b/roles/ipaclient/library/ipaclient_test.py
index 457857b25f5697cc7c06e45408ea760d237b851f..54bc2dfbd7bcfd485d148918e20c5bd37f33e37d 100644
--- a/roles/ipaclient/library/ipaclient_test.py
+++ b/roles/ipaclient/library/ipaclient_test.py
@@ -327,7 +327,10 @@ def main():
         validate_domain_name(options.domain_name)
 
         if options.realm_name:
-            validate_domain_name(options.realm_name, entity="realm")
+            argspec = inspect.getargspec(validate_domain_name)
+            if "entity" in argspec.args:
+                # NUM_VERSION >= 40690:
+                validate_domain_name(options.realm_name, entity="realm")
 
         ### ClientInstallInterface ###
 
diff --git a/roles/ipaserver/library/ipaserver_test.py b/roles/ipaserver/library/ipaserver_test.py
index 81719885d25e127f0087cd41ab102f25097866db..c9f7cce21acc09be805ca328c2cbbb1be2c10489 100644
--- a/roles/ipaserver/library/ipaserver_test.py
+++ b/roles/ipaserver/library/ipaserver_test.py
@@ -565,7 +565,9 @@ def main():
     if not options.realm_name:
         options.realm_name = options.domain_name
     options.realm_name = options.realm_name.upper()
-    if NUM_VERSION >= 40690:
+    argspec = inspect.getargspec(validate_domain_name)
+    if "entity" in argspec.args:
+        # NUM_VERSION >= 40690:
         try:
             validate_domain_name(options.realm_name, entity="realm")
         except ValueError as e: