diff --git a/designate_tempest_plugin/data_utils.py b/designate_tempest_plugin/data_utils.py
index 46c81659..2f61d978 100644
--- a/designate_tempest_plugin/data_utils.py
+++ b/designate_tempest_plugin/data_utils.py
@@ -169,7 +169,7 @@ def rand_mx_recordset(zone_name, pref=None, host=None, **kwargs):
 
 
 def rand_spf_recordset(zone_name, data=None, **kwargs):
-    data = data or "v=spf1 +all"
+    data = data or '"v=spf1 +all"'
     return rand_recordset_data('SPF', zone_name, records=[data], **kwargs)
 
 
@@ -193,7 +193,7 @@ def rand_sshfp_recordset(zone_name, algorithm_number=None,
 
 
 def rand_txt_recordset(zone_name, data=None, **kwargs):
-    data = data or "v=spf1 +all"
+    data = data or '"v=spf1 +all"'
     return rand_recordset_data('TXT', zone_name, records=[data], **kwargs)
 
 
diff --git a/designate_tempest_plugin/tests/api/v2/invalid_txt_dataset.json b/designate_tempest_plugin/tests/api/v2/invalid_txt_dataset.json
index 26633f35..449d90cc 100644
--- a/designate_tempest_plugin/tests/api/v2/invalid_txt_dataset.json
+++ b/designate_tempest_plugin/tests/api/v2/invalid_txt_dataset.json
@@ -1,5 +1,5 @@
 {
   "trailing_slash": {"data": "\\"},
   "trailing_double_slash": {"data": "\\\\"},
-  "trailing_slash_after_text": {"data": "v=spf1 +all\\"}
+  "trailing_slash_after_text": {"data": "testtext\\"}
 }
diff --git a/designate_tempest_plugin/tests/api/v2/recordset_data.json b/designate_tempest_plugin/tests/api/v2/recordset_data.json
index 5790c54a..9f365a72 100644
--- a/designate_tempest_plugin/tests/api/v2/recordset_data.json
+++ b/designate_tempest_plugin/tests/api/v2/recordset_data.json
@@ -47,6 +47,6 @@
     "TXT": {
         "name": "www",
         "type": "TXT",
-        "records": ["Any Old Text Goes Here"]
+        "records": ["\"Any Old Text Goes Here\""]
     }
 }
diff --git a/designate_tempest_plugin/tests/api/v2/recordset_wildcard_data.json b/designate_tempest_plugin/tests/api/v2/recordset_wildcard_data.json
index dedf414a..c56727db 100644
--- a/designate_tempest_plugin/tests/api/v2/recordset_wildcard_data.json
+++ b/designate_tempest_plugin/tests/api/v2/recordset_wildcard_data.json
@@ -33,21 +33,21 @@
     "SPF at APEX": {
         "name": "*",
         "type": "SPF",
-        "records": ["v=spf1; a -all"]
+        "records": ["\"v=spf1; a -all\""]
     },
     "SPF under APEX": {
         "name": "*.sub",
         "type": "SPF",
-        "records": ["v=spf1; a -all"]
+        "records": ["\"v=spf1; a -all\""]
     },
     "TXT at APEX": {
         "name": "*",
         "type": "TXT",
-        "records": ["Can you read me?"]
+        "records": ["\"Can you read me?\""]
     },
     "TXT under APEX": {
         "name": "*.sub",
         "type": "TXT",
-        "records": ["Can you read me?"]
+        "records": ["\"Can you read me?\""]
     }
 }
diff --git a/designate_tempest_plugin/tests/api/v2/test_recordset_validation.py b/designate_tempest_plugin/tests/api/v2/test_recordset_validation.py
index 0786811e..a155f30e 100644
--- a/designate_tempest_plugin/tests/api/v2/test_recordset_validation.py
+++ b/designate_tempest_plugin/tests/api/v2/test_recordset_validation.py
@@ -132,7 +132,7 @@ class RecordsetValidationTest(base.BaseDnsV2Test):
         self.assertRaisesDns(
             exceptions.BadRequest, 'invalid_object', 400,
             self.recordset_client.create_recordset,
-            self.zone['id'], post_model,
+            self.zone['id'], post_model
         )
 
     @decorators.idempotent_id('03e4f811-0c37-4ce2-8b16-662c824f8f18')
diff --git a/designate_tempest_plugin/tests/api/v2/valid_txt_dataset.json b/designate_tempest_plugin/tests/api/v2/valid_txt_dataset.json
index b54b1b3b..3abcf10a 100644
--- a/designate_tempest_plugin/tests/api/v2/valid_txt_dataset.json
+++ b/designate_tempest_plugin/tests/api/v2/valid_txt_dataset.json
@@ -1,5 +1,5 @@
 {
-  "slash_with_one_trailing_space": {"data": "\\ "},
-  "slash_with_many_trailing_space": {"data": "\\    "},
-  "text_with_slash_and_trailing_space": {"data": "the txts    "}
+  "slash_with_one_trailing_space": {"data": "\"\\ \""},
+  "slash_with_many_trailing_space": {"data": "\"\\    \""},
+  "text_with_slash_and_trailing_space": {"data": "\"the txts    \""}
 }
diff --git a/designate_tempest_plugin/tests/base.py b/designate_tempest_plugin/tests/base.py
index e411597a..bef19f2e 100644
--- a/designate_tempest_plugin/tests/base.py
+++ b/designate_tempest_plugin/tests/base.py
@@ -21,7 +21,7 @@ from designate_tempest_plugin import clients
 CONF = config.CONF
 
 
-class AssertRaisesDns(object):
+class AssertRaisesDns(test.BaseTestCase):
     def __init__(self, test_class, exc, type_, code):
         self.test_class = test_class
         self.exc = exc