diff --git a/src/plone/api/configure.zcml b/src/plone/api/configure.zcml
index c25eee7b..fe29cba6 100644
--- a/src/plone/api/configure.zcml
+++ b/src/plone/api/configure.zcml
@@ -1,5 +1,6 @@
 <configure
     xmlns="http://namespaces.zope.org/zope"
-    i18n_domain="plone.api">
+    i18n_domain="plone.api"
+    >
 
 </configure>
diff --git a/src/plone/api/profiles/testfixture/metadata.xml b/src/plone/api/profiles/testfixture/metadata.xml
index 9f02b5ec..db49627f 100644
--- a/src/plone/api/profiles/testfixture/metadata.xml
+++ b/src/plone/api/profiles/testfixture/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <metadata>
   <version>1</version>
   <dependencies>
diff --git a/src/plone/api/profiles/testfixture/types.xml b/src/plone/api/profiles/testfixture/types.xml
index 9a3e48aa..a70943b1 100644
--- a/src/plone/api/profiles/testfixture/types.xml
+++ b/src/plone/api/profiles/testfixture/types.xml
@@ -1,5 +1,11 @@
-<?xml version="1.0"?>
-<object name="portal_types" meta_type="Plone Types Tool">
- <object name="Dexterity Item" meta_type="Dexterity FTI"/>
- <object name="Dexterity Folder" meta_type="Dexterity FTI"/>
+<?xml version="1.0" encoding="utf-8"?>
+<object meta_type="Plone Types Tool"
+        name="portal_types"
+>
+  <object meta_type="Dexterity FTI"
+          name="Dexterity Item"
+  />
+  <object meta_type="Dexterity FTI"
+          name="Dexterity Folder"
+  />
 </object>
diff --git a/src/plone/api/profiles/testfixture/types/Dexterity_Folder.xml b/src/plone/api/profiles/testfixture/types/Dexterity_Folder.xml
index 40dd5203..9c61671e 100644
--- a/src/plone/api/profiles/testfixture/types/Dexterity_Folder.xml
+++ b/src/plone/api/profiles/testfixture/types/Dexterity_Folder.xml
@@ -1,40 +1,62 @@
-<?xml version="1.0"?>
-<object name="Dexterity Folder" meta_type="Dexterity FTI"
-   xmlns:i18n="http://xml.zope.org/namespaces/i18n">
- <property name="title">Dexterity Folder</property>
- <property name="description"></property>
- <property name="content_icon"></property>
- <property name="link_target"></property>
- <property name="immediate_view">view</property>
- <property name="global_allow">True</property>
- <property name="filter_content_types">False</property>
- <property name="allowed_content_types"/>
- <property name="allow_discussion">False</property>
- <property name="default_view">view</property>
- <property name="view_methods">
-  <element value="view"/>
- </property>
- <property name="default_view_fallback">False</property>
- <property name="add_permission">cmf.AddPortalContent</property>
- <property name="klass">plone.dexterity.content.Container</property>
- <property name="behaviors">
-  <element value="plone.app.dexterity.behaviors.metadata.IDublinCore"/>
- </property>
- <property name="schema"></property>
- <property name="model_source"></property>
- <property name="model_file">plone.api.tests:Dexterity_Folder.xml</property>
- <alias from="(Default)" to="(dynamic view)"/>
- <alias from="edit" to="@@edit"/>
- <alias from="sharing" to="@@sharing"/>
- <alias from="view" to="(selected layout)"/>
- <action title="View" action_id="view" category="object" condition_expr=""
-    icon_expr="" link_target="" url_expr="string:${object_url}"
-    visible="True">
-  <permission value="View"/>
- </action>
- <action title="Edit" action_id="edit" category="object" condition_expr=""
-    icon_expr="" link_target="" url_expr="string:${object_url}/edit"
-    visible="True">
-  <permission value="Modify portal content"/>
- </action>
+<?xml version="1.0" encoding="utf-8"?>
+<object xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+        meta_type="Dexterity FTI"
+        name="Dexterity Folder"
+>
+  <property name="title">Dexterity Folder</property>
+  <property name="description" />
+  <property name="content_icon" />
+  <property name="link_target" />
+  <property name="immediate_view">view</property>
+  <property name="global_allow">True</property>
+  <property name="filter_content_types">False</property>
+  <property name="allowed_content_types" />
+  <property name="allow_discussion">False</property>
+  <property name="default_view">view</property>
+  <property name="view_methods">
+    <element value="view" />
+  </property>
+  <property name="default_view_fallback">False</property>
+  <property name="add_permission">cmf.AddPortalContent</property>
+  <property name="klass">plone.dexterity.content.Container</property>
+  <property name="behaviors">
+    <element value="plone.app.dexterity.behaviors.metadata.IDublinCore" />
+  </property>
+  <property name="schema" />
+  <property name="model_source" />
+  <property name="model_file">plone.api.tests:Dexterity_Folder.xml</property>
+  <alias from="(Default)"
+         to="(dynamic view)"
+  />
+  <alias from="edit"
+         to="@@edit"
+  />
+  <alias from="sharing"
+         to="@@sharing"
+  />
+  <alias from="view"
+         to="(selected layout)"
+  />
+  <action action_id="view"
+          category="object"
+          condition_expr=""
+          icon_expr=""
+          link_target=""
+          title="View"
+          url_expr="string:${object_url}"
+          visible="True"
+  >
+    <permission value="View" />
+  </action>
+  <action action_id="edit"
+          category="object"
+          condition_expr=""
+          icon_expr=""
+          link_target=""
+          title="Edit"
+          url_expr="string:${object_url}/edit"
+          visible="True"
+  >
+    <permission value="Modify portal content" />
+  </action>
 </object>
diff --git a/src/plone/api/profiles/testfixture/types/Dexterity_Item.xml b/src/plone/api/profiles/testfixture/types/Dexterity_Item.xml
index 3c31f131..74ef9bc0 100644
--- a/src/plone/api/profiles/testfixture/types/Dexterity_Item.xml
+++ b/src/plone/api/profiles/testfixture/types/Dexterity_Item.xml
@@ -1,40 +1,62 @@
-<?xml version="1.0"?>
-<object name="Dexterity Item" meta_type="Dexterity FTI"
-   xmlns:i18n="http://xml.zope.org/namespaces/i18n">
- <property name="title">Dexterity Item</property>
- <property name="description"></property>
- <property name="content_icon"></property>
- <property name="link_target"></property>
- <property name="immediate_view">view</property>
- <property name="global_allow">True</property>
- <property name="filter_content_types">True</property>
- <property name="allowed_content_types"/>
- <property name="allow_discussion">False</property>
- <property name="default_view">view</property>
- <property name="view_methods">
-  <element value="view"/>
- </property>
- <property name="default_view_fallback">False</property>
- <property name="add_permission">cmf.AddPortalContent</property>
- <property name="klass">plone.dexterity.content.Item</property>
- <property name="behaviors">
-  <element value="plone.app.dexterity.behaviors.metadata.IDublinCore"/>
- </property>
- <property name="schema"></property>
- <property name="model_source"></property>
- <property name="model_file">plone.api.tests:Dexterity_Item.xml</property>
- <alias from="(Default)" to="(dynamic view)"/>
- <alias from="edit" to="@@edit"/>
- <alias from="sharing" to="@@sharing"/>
- <alias from="view" to="(selected layout)"/>
- <action title="View" action_id="view" category="object" condition_expr=""
-    icon_expr="" link_target="" url_expr="string:${object_url}"
-    visible="True">
-  <permission value="View"/>
- </action>
- <action title="Edit" action_id="edit" category="object" condition_expr=""
-    icon_expr="" link_target="" url_expr="string:${object_url}/edit"
-    visible="True">
-  <permission value="Modify portal content"/>
- </action>
+<?xml version="1.0" encoding="utf-8"?>
+<object xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+        meta_type="Dexterity FTI"
+        name="Dexterity Item"
+>
+  <property name="title">Dexterity Item</property>
+  <property name="description" />
+  <property name="content_icon" />
+  <property name="link_target" />
+  <property name="immediate_view">view</property>
+  <property name="global_allow">True</property>
+  <property name="filter_content_types">True</property>
+  <property name="allowed_content_types" />
+  <property name="allow_discussion">False</property>
+  <property name="default_view">view</property>
+  <property name="view_methods">
+    <element value="view" />
+  </property>
+  <property name="default_view_fallback">False</property>
+  <property name="add_permission">cmf.AddPortalContent</property>
+  <property name="klass">plone.dexterity.content.Item</property>
+  <property name="behaviors">
+    <element value="plone.app.dexterity.behaviors.metadata.IDublinCore" />
+  </property>
+  <property name="schema" />
+  <property name="model_source" />
+  <property name="model_file">plone.api.tests:Dexterity_Item.xml</property>
+  <alias from="(Default)"
+         to="(dynamic view)"
+  />
+  <alias from="edit"
+         to="@@edit"
+  />
+  <alias from="sharing"
+         to="@@sharing"
+  />
+  <alias from="view"
+         to="(selected layout)"
+  />
+  <action action_id="view"
+          category="object"
+          condition_expr=""
+          icon_expr=""
+          link_target=""
+          title="View"
+          url_expr="string:${object_url}"
+          visible="True"
+  >
+    <permission value="View" />
+  </action>
+  <action action_id="edit"
+          category="object"
+          condition_expr=""
+          icon_expr=""
+          link_target=""
+          title="Edit"
+          url_expr="string:${object_url}/edit"
+          visible="True"
+  >
+    <permission value="Modify portal content" />
+  </action>
 </object>
diff --git a/src/plone/api/testing.zcml b/src/plone/api/testing.zcml
index 26d9ce41..1a9fbf15 100644
--- a/src/plone/api/testing.zcml
+++ b/src/plone/api/testing.zcml
@@ -1,17 +1,21 @@
 <configure
     xmlns="http://namespaces.zope.org/zope"
     xmlns:genericsetup="http://namespaces.zope.org/genericsetup"
-    i18n_domain="plone.api">
+    i18n_domain="plone.api"
+    >
 
-    <include package="Products.GenericSetup" file="meta.zcml"/>
+  <include
+      package="Products.GenericSetup"
+      file="meta.zcml"
+      />
 
-    <genericsetup:registerProfile
-        name="testfixture"
-        title="plone.api: Test fixture"
-        directory="profiles/testfixture"
-        description="Extension profile to configure a test fixture"
-        for="Products.CMFPlone.interfaces.ITestCasePloneSiteRoot"
-        provides="Products.GenericSetup.interfaces.EXTENSION"
-        />
+  <genericsetup:registerProfile
+      name="testfixture"
+      title="plone.api: Test fixture"
+      description="Extension profile to configure a test fixture"
+      provides="Products.GenericSetup.interfaces.EXTENSION"
+      for="Products.CMFPlone.interfaces.ITestCasePloneSiteRoot"
+      directory="profiles/testfixture"
+      />
 
 </configure>
diff --git a/src/plone/api/tests/Dexterity_Folder.xml b/src/plone/api/tests/Dexterity_Folder.xml
index d93a4890..b1bc2ab7 100644
--- a/src/plone/api/tests/Dexterity_Folder.xml
+++ b/src/plone/api/tests/Dexterity_Folder.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <model xmlns="http://namespaces.plone.org/supermodel/schema">
- <schema />
+  <schema />
 </model>
diff --git a/src/plone/api/tests/Dexterity_Item.xml b/src/plone/api/tests/Dexterity_Item.xml
index d93a4890..b1bc2ab7 100644
--- a/src/plone/api/tests/Dexterity_Item.xml
+++ b/src/plone/api/tests/Dexterity_Item.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <model xmlns="http://namespaces.plone.org/supermodel/schema">
- <schema />
+  <schema />
 </model>