diff --git a/pungi/metadata.py b/pungi/metadata.py
index d57ba77e..b853e1f4 100644
--- a/pungi/metadata.py
+++ b/pungi/metadata.py
@@ -36,7 +36,7 @@ def get_description(compose, variant, arch):
     else:
         result = "%s %s" % (compose.conf["release_name"], compose.conf["release_version"])
         if compose.conf.get("release_is_layered", False):
-            result += "for %s %s" % (compose.conf["base_product_name"], compose.conf["base_product_version"])
+            result += " for %s %s" % (compose.conf["base_product_name"], compose.conf["base_product_version"])
 
     result = result % {"variant_name": variant.name, "arch": arch}
     return result
diff --git a/tests/test_metadata.py b/tests/test_metadata.py
new file mode 100644
index 00000000..165638fa
--- /dev/null
+++ b/tests/test_metadata.py
@@ -0,0 +1,123 @@
+#!/usr/bin/env python2
+# -*- coding: utf-8 -*-
+
+import mock
+import unittest
+import os
+import sys
+
+sys.path.insert(0, os.path.join(os.path.dirname(__file__), ".."))
+
+from tests import helpers
+
+from pungi import metadata
+from pungi.compose_metadata import discinfo
+
+
+def mock_time():
+    return 101010101.01
+
+
+class DiscInfoTestCase(helpers.PungiTestCase):
+
+    def setUp(self):
+        super(DiscInfoTestCase, self).setUp()
+        self.path = os.path.join(self.topdir, 'compose/Server/x86_64/os/.discinfo')
+
+    @mock.patch('time.time', new=mock_time)
+    def test_write_discinfo_variant(self):
+        compose = helpers.DummyCompose(self.topdir, {
+            'release_name': 'Test',
+            'release_version': '1.0',
+        })
+
+        metadata.write_discinfo(compose, 'x86_64', compose.variants['Server'])
+
+        with open(self.path) as f:
+            self.assertEqual(f.read().strip().split('\n'),
+                             ['101010101.010000',
+                              'Test 1.0',
+                              'x86_64',
+                              'ALL'])
+
+        self.assertEqual(discinfo.read_discinfo(self.path),
+                         {'timestamp': '101010101.010000',
+                          'description': 'Test 1.0',
+                          'disc_numbers': ['ALL'],
+                          'arch': 'x86_64'})
+
+    @mock.patch('time.time', new=mock_time)
+    def test_write_discinfo_custom_description(self):
+        compose = helpers.DummyCompose(self.topdir, {
+            'release_name': 'Test',
+            'release_version': '1.0',
+            'release_discinfo_description': 'Fuzzy %(variant_name)s.%(arch)s',
+        })
+        compose.variants['Server'].name = 'Server'
+
+        metadata.write_discinfo(compose, 'x86_64', compose.variants['Server'])
+
+        with open(self.path) as f:
+            self.assertEqual(f.read().strip().split('\n'),
+                             ['101010101.010000',
+                              'Fuzzy Server.x86_64',
+                              'x86_64',
+                              'ALL'])
+
+    @mock.patch('time.time', new=mock_time)
+    def test_write_discinfo_layered_product(self):
+        compose = helpers.DummyCompose(self.topdir, {
+            'release_name': 'Test',
+            'release_version': '1.0',
+            'release_is_layered': True,
+            'base_product_name': 'Base',
+            'base_product_version': 42,
+        })
+
+        metadata.write_discinfo(compose, 'x86_64', compose.variants['Server'])
+
+        with open(self.path) as f:
+            self.assertEqual(f.read().strip().split('\n'),
+                             ['101010101.010000',
+                              'Test 1.0 for Base 42',
+                              'x86_64',
+                              'ALL'])
+
+    @mock.patch('time.time', new=mock_time)
+    def test_write_discinfo_integrated_layered_product(self):
+        compose = helpers.DummyCompose(self.topdir, {
+            'release_name': 'Test',
+            'release_version': '1.0',
+        })
+        compose.variants['ILP'] = mock.Mock(uid='Server', arches=['x86_64'],
+                                            type='layered-product', is_empty=False,
+                                            release_name='Integrated',
+                                            release_version='2.1',
+                                            parent=compose.variants['Server'])
+
+        metadata.write_discinfo(compose, 'x86_64', compose.variants['ILP'])
+
+        with open(self.path) as f:
+            self.assertEqual(f.read().strip().split('\n'),
+                             ['101010101.010000',
+                              'Integrated 2.1 for Test 1',
+                              'x86_64',
+                              'ALL'])
+
+    @mock.patch('time.time', new=mock_time)
+    def test_addons_dont_have_discinfo(self):
+        compose = helpers.DummyCompose(self.topdir, {
+            'release_name': 'Test',
+            'release_version': '1.0',
+        })
+        compose.variants['ILP'] = mock.Mock(uid='Server', arches=['x86_64'],
+                                            type='addon', is_empty=False,
+                                            parent=compose.variants['Server'])
+
+        metadata.write_discinfo(compose, 'x86_64', compose.variants['ILP'])
+
+        self.assertFalse(os.path.isfile(self.path))
+
+
+if __name__ == "__main__":
+    unittest.main()