diff --git a/neutron/tests/tools.py b/neutron/tests/tools.py
index adc0ae8c6d6..445e5077092 100644
--- a/neutron/tests/tools.py
+++ b/neutron/tests/tools.py
@@ -249,7 +249,7 @@ def get_random_cidr(version=4):
         return '10.%d.%d.0/%d' % (random.randint(3, 254),
                                   random.randint(3, 254),
                                   24)
-    return '2001:db8:%x::/&d' % (random.getrandbits(16), 64)
+    return '2001:db8:%x::/%d' % (random.getrandbits(16), 64)
 
 
 def get_random_mac():
diff --git a/neutron/tests/unit/objects/test_base.py b/neutron/tests/unit/objects/test_base.py
index beab109392c..d3ccb2894da 100644
--- a/neutron/tests/unit/objects/test_base.py
+++ b/neutron/tests/unit/objects/test_base.py
@@ -250,6 +250,12 @@ def get_obj_db_fields(obj):
             if field not in obj.synthetic_fields}
 
 
+def get_value(generator, version):
+    if 'version' in generator.__code__.co_varnames:
+        return generator(version=version)
+    return generator()
+
+
 def remove_timestamps_from_fields(obj_fields):
     return {field: value for field, value in obj_fields.items()
             if field not in TIMESTAMP_FIELDS}
@@ -288,10 +294,11 @@ class _BaseObjectTestCase(object):
     def get_random_fields(cls, obj_cls=None):
         obj_cls = obj_cls or cls._test_class
         fields = {}
+        ip_version = tools.get_random_ip_version()
         for field, field_obj in obj_cls.fields.items():
             if field not in obj_cls.synthetic_fields:
                 generator = FIELD_TYPE_VALUE_GENERATOR_MAP[type(field_obj)]
-                fields[field] = generator()
+                fields[field] = get_value(generator, ip_version)
         obj = obj_cls(None, **fields)
         return obj.modify_fields_to_db(fields)