diff --git a/fdroidserver/metadata.py b/fdroidserver/metadata.py
index f63349de..ac97edf3 100644
--- a/fdroidserver/metadata.py
+++ b/fdroidserver/metadata.py
@@ -837,7 +837,7 @@ def post_metadata_parse(app):
         elif v == [False]:
             return ['no']
 
-    _bool_allowed = ('disable', 'kivy', 'maven')
+    _bool_allowed = ('disable', 'kivy', 'maven', 'buildozer')
 
     builds = []
     if 'builds' in app:
@@ -1063,7 +1063,7 @@ def write_yaml(mf, app):
                     value = getattr(build, field)
                     if field == 'gradle' and value == ['off']:
                         value = [ruamel.yaml.scalarstring.SingleQuotedScalarString('off')]
-                    if field in ('disable', 'kivy', 'maven'):
+                    if field in ('disable', 'kivy', 'maven', 'buildozer'):
                         if value == 'no':
                             continue
                         elif value == 'yes':
diff --git a/tests/metadata/rewrite-yml/app.with.special.build.params.yml b/tests/metadata-rewrite-yml/app.with.special.build.params.yml
similarity index 100%
rename from tests/metadata/rewrite-yml/app.with.special.build.params.yml
rename to tests/metadata-rewrite-yml/app.with.special.build.params.yml
diff --git a/tests/metadata/rewrite-yml/fake.ota.update.yml b/tests/metadata-rewrite-yml/fake.ota.update.yml
similarity index 100%
rename from tests/metadata/rewrite-yml/fake.ota.update.yml
rename to tests/metadata-rewrite-yml/fake.ota.update.yml
diff --git a/tests/metadata/rewrite-yml/org.fdroid.fdroid.yml b/tests/metadata-rewrite-yml/org.fdroid.fdroid.yml
similarity index 100%
rename from tests/metadata/rewrite-yml/org.fdroid.fdroid.yml
rename to tests/metadata-rewrite-yml/org.fdroid.fdroid.yml
diff --git a/tests/metadata.TestCase b/tests/metadata.TestCase
index 712d16f7..ee113287 100755
--- a/tests/metadata.TestCase
+++ b/tests/metadata.TestCase
@@ -72,7 +72,7 @@ class MetadataTest(unittest.TestCase):
 
         # assert rewrite result
         with open(os.path.join(testdir, 'fake.ota.update.yml'), 'r', encoding='utf-8') as result:
-            with open('metadata/rewrite-yml/fake.ota.update.yml', 'r', encoding='utf-8') as orig:
+            with open('metadata-rewrite-yml/fake.ota.update.yml', 'r', encoding='utf-8') as orig:
                 self.maxDiff = None
                 self.assertEqual(result.read(), orig.read())
 
@@ -93,7 +93,7 @@ class MetadataTest(unittest.TestCase):
 
         # assert rewrite result
         with open(os.path.join(testdir, 'org.fdroid.fdroid.yml'), 'r', encoding='utf-8') as result:
-            with open('metadata/rewrite-yml/org.fdroid.fdroid.yml', 'r', encoding='utf-8') as orig:
+            with open('metadata-rewrite-yml/org.fdroid.fdroid.yml', 'r', encoding='utf-8') as orig:
                 self.maxDiff = None
                 self.assertEqual(result.read(), orig.read())
 
@@ -114,7 +114,7 @@ class MetadataTest(unittest.TestCase):
 
         # assert rewrite result
         with open(os.path.join(testdir, 'app.with.special.build.params.yml'), 'r', encoding='utf-8') as result:
-            with open('metadata/rewrite-yml/app.with.special.build.params.yml', 'r', encoding='utf-8') as orig:
+            with open('metadata-rewrite-yml/app.with.special.build.params.yml', 'r', encoding='utf-8') as orig:
                 self.maxDiff = None
                 self.assertEqual(result.read(), orig.read())