diff --git a/core/modules/config/lib/Drupal/config/Tests/ConfigEntityTest.php b/core/modules/config/lib/Drupal/config/Tests/ConfigEntityTest.php
index 532979c..45a16b9 100644
--- a/core/modules/config/lib/Drupal/config/Tests/ConfigEntityTest.php
+++ b/core/modules/config/lib/Drupal/config/Tests/ConfigEntityTest.php
@@ -85,6 +85,19 @@ function testCRUD() {
     $this->assertResponse(200);
     $this->assertNoText($label1);
     $this->assertText($label3);
+
+    // Create a configuration entity with '0' machine name.
+    $edit = array(
+      'id' => '0',
+      'label' => '0',
+    );
+    $this->drupalPost('admin/structure/config_test/add', $edit, 'Save');
+    $this->assertResponse(200);
+    $message_insert = format_string('%label configuration has been created.', array('%label' => $edit['id']));
+    $this->assertRaw($message_insert);
+
+    $this->drupalPost('admin/structure/config_test/manage/0/delete', array(), 'Delete');
+    $this->assertFalse(entity_load('config_test', '0'), 'Test entity deleted');
   }
 
 }