diff --git a/tests/UnitTests/TemplateSource/TagTests/MakeNocache/CompileMakeNocacheTest.php b/tests/UnitTests/TemplateSource/TagTests/MakeNocache/CompileMakeNocacheTest.php
index 0bd27101..32b3f845 100644
--- a/tests/UnitTests/TemplateSource/TagTests/MakeNocache/CompileMakeNocacheTest.php
+++ b/tests/UnitTests/TemplateSource/TagTests/MakeNocache/CompileMakeNocacheTest.php
@@ -294,5 +294,16 @@ class CompileMakeNocacheTest extends PHPUnit_Smarty
         $this->assertEquals($this->strip('uwe\'s'), $this->strip($this->smarty->fetch('002_test_backslash.tpl')));
     }
 
+    /**
+     * Test {make_nocache} with values containing spaces
+     *
+     * @preserveGlobalState disabled
+     */
+    public function testMakeNocache_003()
+    {
+        $this->smarty->setCaching(true);
+        $this->smarty->assign('foo', 'the Smarty template engine');
+        $this->assertEquals($this->strip('the Smarty template engine'), $this->strip($this->smarty->fetch('003_test_spaces.tpl')));
+    }
 
 }
diff --git a/tests/UnitTests/TemplateSource/TagTests/MakeNocache/templates/003_test_spaces.tpl b/tests/UnitTests/TemplateSource/TagTests/MakeNocache/templates/003_test_spaces.tpl
new file mode 100644
index 00000000..ab21fba8
--- /dev/null
+++ b/tests/UnitTests/TemplateSource/TagTests/MakeNocache/templates/003_test_spaces.tpl
@@ -0,0 +1 @@
+{make_nocache $foo}{$foo nocache}
\ No newline at end of file