diff --git a/tests/unit/Models/SubscriberCustomFieldTest.php b/tests/unit/Models/SubscriberCustomFieldTest.php
index 1524a9055b..519bab663e 100644
--- a/tests/unit/Models/SubscriberCustomFieldTest.php
+++ b/tests/unit/Models/SubscriberCustomFieldTest.php
@@ -5,36 +5,31 @@ class SubscriberCustomFieldTest extends MailPoetTest {
   function __construct() {
     $this->data = array(
       array(
-        10,
-        // custom_field_id
-        12,
-        // subscriber_id
-        'Test 1'
-        // value
+        'custom_field_id' => 10,
+        'subscriber_id' => 12,
+        'value' => 'Test 1'
       ),
       array(
-        10,
-        // custom_field_id
-        13,
-        // subscriber_id
-        'Test 2'
-        // value
+        'custom_field_id' => 10,
+        'subscriber_id' => 13,
+        'value' => 'Test 2'
       )
     );
   }
 
   function testItCanBeCreated() {
     $subscriberCustomField = SubscriberCustomField::create();
-    $subscriberCustomField->custom_field_id = $this->data[0][0];
-    $subscriberCustomField->subscriber_id = $this->data[0][1];
-    $subscriberCustomField->value = $this->data[0][2];
+    $subscriberCustomField->custom_field_id = $this->data[0]['custom_field_id'];
+    $subscriberCustomField->subscriber_id = $this->data[0]['subscriber_id'];
+    $subscriberCustomField->value = $this->data[0]['value'];
     $subscriberCustomField->save();
     expect($subscriberCustomField->id())->greaterOrEquals(1);
     expect($subscriberCustomField->getErrors())->false();
   }
 
   function testItCanCreateMultipleRecords() {
-    SubscriberCustomField::createMultiple($this->data);
+    $data = array_map('array_values', $this->data);
+    SubscriberCustomField::createMultiple($data);
     $records = SubscriberCustomField::findArray();
     expect(count($records))->equals(2);
     expect($records[0]['value'])->equals('Test 1');
@@ -42,9 +37,11 @@ class SubscriberCustomFieldTest extends MailPoetTest {
   }
 
   function testItCanUpdateMultipleRecords() {
-    SubscriberCustomField::createMultiple($this->data);
+    $data = array_map('array_values', $this->data);
+    SubscriberCustomField::createMultiple($data);
     $updated_data = $this->data;
-    $updated_data[0][2] = 'Updated';
+    $updated_data[0]['value'] = 'Updated';
+    $updated_data = array_map('array_values', $updated_data);
     SubscriberCustomField::updateMultiple($updated_data);
     $records = SubscriberCustomField::findArray();
     expect($records[0]['value'])->equals('Updated');
@@ -52,11 +49,12 @@ class SubscriberCustomFieldTest extends MailPoetTest {
   }
 
   function testItCanDeleteManySubscriberRelations() {
-    SubscriberCustomField::createMultiple($this->data);
+    $data = array_map('array_values', $this->data);
+    SubscriberCustomField::createMultiple($data);
     SubscriberCustomField::deleteManySubscriberRelations(
       array(
-        $this->data[0][1],
-        $this->data[1][1]
+        $this->data[0]['subscriber_id'],
+        $this->data[1]['subscriber_id']
       )
     );
     $records = SubscriberCustomField::findArray();
@@ -64,8 +62,9 @@ class SubscriberCustomFieldTest extends MailPoetTest {
   }
 
   function testItCanDeleteSubscriberRelations() {
-    SubscriberCustomField::createMultiple($this->data);
-    $subscriber = (object)array('id' => $this->data[0][1]);
+    $data = array_map('array_values', $this->data);
+    SubscriberCustomField::createMultiple($data);
+    $subscriber = (object)array('id' => $this->data[0]['subscriber_id']);
     SubscriberCustomField::deleteSubscriberRelations($subscriber);
     $records = SubscriberCustomField::findArray();
     expect($records)->count(1);