diff --git a/commerce_message.test b/commerce_message.test
index d03a385..1cfdb4b 100644
--- a/commerce_message.test
+++ b/commerce_message.test
@@ -497,4 +497,26 @@ class CommerceMessageTokenTest extends CommerceMessageTestBase {
 
   }
 
+  public function testCloneHasToken() {
+    $this->drupalLogin($this->store_admin);
+    $edit = array(
+      'name' => 'commerce_order_order_confirmation_cloned_',
+      'description' => 'Commerce Order: order confirmation (cloned)',
+    );
+    $this->drupalPost('admin/structure/messages/manage/commerce_order_order_confirmation/clone', $edit, t('Save message type'));
+
+    if (!message_type_load('commerce_order_order_confirmation_cloned_')) {
+      $this->fail('Failed to clone the message type');
+    }
+
+    $this->drupalGet('admin/structure/messages/manage/commerce_order_order_confirmation_cloned_/fields');
+    $this->assertText('message_commerce_order');
+
+    $order = $this->createDummyOrder();
+    $message = message_create('commerce_order_order_confirmation_cloned_', array(), $this->store_admin);
+    $message->wrapper()->message_commerce_order = $order;
+    $message->save();
+
+    $this->assertTrue(isset($message->arguments['!order-summary']));
+  }
 }