diff --git a/designate_tempest_plugin/tests/api/v2/recordset_data.json b/designate_tempest_plugin/tests/api/v2/recordset_data.json
index e9483b8..5790c54 100644
--- a/designate_tempest_plugin/tests/api/v2/recordset_data.json
+++ b/designate_tempest_plugin/tests/api/v2/recordset_data.json
@@ -24,18 +24,13 @@
                     "20 30 5060 server3.example.com."]
     },
     "CNAME": {
-        "name": "www",
+        "name": "alias-of-target",
         "type": "CNAME",
         "records": ["target.example.org."]
     },
     "MX at APEX": {
         "name": null,
         "type": "MX",
-        "records": ["10 mail.example.org."]
-    },
-    "MX at APEX multiple": {
-        "name": null,
-        "type": "MX",
         "records": ["10 mail1.example.org.",
                     "20 mail2.example.org."]
     },
diff --git a/designate_tempest_plugin/tests/api/v2/test_recordset.py b/designate_tempest_plugin/tests/api/v2/test_recordset.py
index b7a8a16..6d318d0 100644
--- a/designate_tempest_plugin/tests/api/v2/test_recordset.py
+++ b/designate_tempest_plugin/tests/api/v2/test_recordset.py
@@ -69,6 +69,28 @@
         LOG.info('Ensure we respond with PENDING')
         self.assertEqual('PENDING', body['status'])
 
+    @decorators.idempotent_id('d03b69a5-5052-43bc-a38a-b511b6b34304')
+    @ddt.file_data("recordset_data.json")
+    def test_create_all_recordset_types(self, name, type, records):
+        if name is not None:
+            recordset_name = name + "." + self.zone['name']
+
+        else:
+            recordset_name = self.zone['name']
+
+        recordset_data = {
+            'name': recordset_name,
+            'type': type,
+            'records': records,
+        }
+
+        LOG.info('Create a Recordset')
+        resp, body = self.client.create_recordset(
+            self.zone['id'], recordset_data)
+
+        LOG.info('Ensure we respond with PENDING')
+        self.assertEqual('PENDING', body['status'])
+
     @decorators.idempotent_id('5964f730-5546-46e6-9105-5030e9c492b2')
     def test_list_recordsets(self):
         recordset_data = data_utils.rand_recordset_data(