diff --git a/test/Makefile.am b/test/Makefile.am
index 2f338913..f373585c 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -500,15 +500,36 @@ static_data = \
 	data/equiv-config-files/entities/basic.d/basic.conf \
 	data/equiv-config-files/entities/entities-1.conf \
 	data/equiv-config-files/entities/entities-2.conf \
+	data/invalid-config-files/apparmor-bad-attribute.conf \
+	data/invalid-config-files/apparmor-bad-mode.conf \
+	data/invalid-config-files/bad-attribute.conf \
+	data/invalid-config-files/bad-attribute-2.conf \
+	data/invalid-config-files/bad-element.conf \
+	data/invalid-config-files/bad-limit.conf \
 	data/invalid-config-files/badselinux-1.conf \
 	data/invalid-config-files/badselinux-2.conf \
 	data/invalid-config-files/circular-1.conf \
 	data/invalid-config-files/circular-2.conf \
 	data/invalid-config-files/circular-3.conf \
+	data/invalid-config-files/double-attribute.conf \
 	data/invalid-config-files/impossible-send.conf \
+	data/invalid-config-files/limit-no-name.conf \
+	data/invalid-config-files/ludicrous-limit.conf \
+	data/invalid-config-files/negative-limit.conf \
+	data/invalid-config-files/non-numeric-limit.conf \
 	data/invalid-config-files/not-well-formed.conf \
+	data/invalid-config-files/policy-bad-at-console.conf \
+	data/invalid-config-files/policy-bad-attribute.conf \
+	data/invalid-config-files/policy-bad-context.conf \
+	data/invalid-config-files/policy-bad-rule-attribute.conf \
+	data/invalid-config-files/policy-contradiction.conf \
+	data/invalid-config-files/policy-member-no-path.conf \
+	data/invalid-config-files/policy-mixed.conf \
+	data/invalid-config-files/policy-no-attributes.conf \
+	data/invalid-config-files/policy-no-rule-attribute.conf \
 	data/invalid-config-files/truncated-file.conf \
 	data/invalid-config-files/send-and-receive.conf \
+	data/invalid-config-files/unknown-limit.conf \
 	data/invalid-messages/boolean-has-no-value.message-raw \
 	data/sha-1/Readme.txt \
 	data/sha-1/bit-hashes.sha1 \
@@ -527,6 +548,7 @@ static_data = \
 	data/valid-config-files/entities.conf \
 	data/valid-config-files/listen-unix-runtime.conf \
 	data/valid-config-files/many-rules.conf \
+	data/valid-config-files/minimal.conf \
 	data/valid-config-files/standard-session-dirs.conf \
 	data/valid-config-files-system/many-rules.conf \
 	data/valid-config-files-system/system.d/test.conf \
diff --git a/test/data/invalid-config-files/apparmor-bad-attribute.conf b/test/data/invalid-config-files/apparmor-bad-attribute.conf
new file mode 100644
index 00000000..16a10e8a
--- /dev/null
+++ b/test/data/invalid-config-files/apparmor-bad-attribute.conf
@@ -0,0 +1,4 @@
+<busconfig>
+  <listen>tcp:port=1234</listen>
+  <apparmor enforcement_style="Judge Dredd"/>
+</busconfig>
diff --git a/test/data/invalid-config-files/apparmor-bad-mode.conf b/test/data/invalid-config-files/apparmor-bad-mode.conf
new file mode 100644
index 00000000..2398ee53
--- /dev/null
+++ b/test/data/invalid-config-files/apparmor-bad-mode.conf
@@ -0,0 +1,4 @@
+<busconfig>
+  <listen>tcp:port=1234</listen>
+  <apparmor mode="plaintive"/>
+</busconfig>
diff --git a/test/data/invalid-config-files/bad-attribute-2.conf b/test/data/invalid-config-files/bad-attribute-2.conf
new file mode 100644
index 00000000..cc430f54
--- /dev/null
+++ b/test/data/invalid-config-files/bad-attribute-2.conf
@@ -0,0 +1,3 @@
+<busconfig>
+  <listen carefully="yes">tcp:port=1234</listen>
+</busconfig>
diff --git a/test/data/invalid-config-files/bad-attribute.conf b/test/data/invalid-config-files/bad-attribute.conf
new file mode 100644
index 00000000..993dd3cf
--- /dev/null
+++ b/test/data/invalid-config-files/bad-attribute.conf
@@ -0,0 +1,4 @@
+<busconfig>
+  <listen>tcp:port=1234</listen>
+  <limit wildebeest="gnu">5000</limit>
+</busconfig>
diff --git a/test/data/invalid-config-files/bad-element.conf b/test/data/invalid-config-files/bad-element.conf
new file mode 100644
index 00000000..77067ebd
--- /dev/null
+++ b/test/data/invalid-config-files/bad-element.conf
@@ -0,0 +1,4 @@
+<busconfig>
+  <listen>tcp:port=1234</listen>
+  <bees/>
+</busconfig>
diff --git a/test/data/invalid-config-files/bad-limit.conf b/test/data/invalid-config-files/bad-limit.conf
new file mode 100644
index 00000000..9b7b3177
--- /dev/null
+++ b/test/data/invalid-config-files/bad-limit.conf
@@ -0,0 +1,4 @@
+<busconfig>
+  <listen>tcp:port=1234</listen>
+  <limit name="max_names_per_connection">as many as you like</limit>
+</busconfig>
diff --git a/test/data/invalid-config-files/double-attribute.conf b/test/data/invalid-config-files/double-attribute.conf
new file mode 100644
index 00000000..514fda40
--- /dev/null
+++ b/test/data/invalid-config-files/double-attribute.conf
@@ -0,0 +1,4 @@
+<busconfig>
+  <listen>tcp:port=1234</listen>
+  <limit name="max_incoming_bytes" name="max_incoming_bytes">5000</limit>
+</busconfig>
diff --git a/test/data/invalid-config-files/limit-no-name.conf b/test/data/invalid-config-files/limit-no-name.conf
new file mode 100644
index 00000000..390a4af1
--- /dev/null
+++ b/test/data/invalid-config-files/limit-no-name.conf
@@ -0,0 +1,4 @@
+<busconfig>
+  <listen>tcp:port=1234</listen>
+  <limit/>
+</busconfig>
diff --git a/test/data/invalid-config-files/ludicrous-limit.conf b/test/data/invalid-config-files/ludicrous-limit.conf
new file mode 100644
index 00000000..d78f0b5d
--- /dev/null
+++ b/test/data/invalid-config-files/ludicrous-limit.conf
@@ -0,0 +1,5 @@
+<busconfig>
+  <listen>tcp:port=1234</listen>
+  <!-- Chosen to be out-of-range for int, but not long (on 64-bit) -->
+  <limit name="max_names_per_connection">3123123123</limit>
+</busconfig>
diff --git a/test/data/invalid-config-files/negative-limit.conf b/test/data/invalid-config-files/negative-limit.conf
new file mode 100644
index 00000000..de10d1a2
--- /dev/null
+++ b/test/data/invalid-config-files/negative-limit.conf
@@ -0,0 +1,4 @@
+<busconfig>
+  <listen>tcp:port=1234</listen>
+  <limit name="max_names_per_connection">-1</limit>
+</busconfig>
diff --git a/test/data/invalid-config-files/non-numeric-limit.conf b/test/data/invalid-config-files/non-numeric-limit.conf
new file mode 100644
index 00000000..99b4429e
--- /dev/null
+++ b/test/data/invalid-config-files/non-numeric-limit.conf
@@ -0,0 +1,4 @@
+<busconfig>
+  <listen>tcp:port=1234</listen>
+  <limit name="max_names_per_connection">bees</limit>
+</busconfig>
diff --git a/test/data/invalid-config-files/policy-bad-at-console.conf b/test/data/invalid-config-files/policy-bad-at-console.conf
new file mode 100644
index 00000000..1994cb91
--- /dev/null
+++ b/test/data/invalid-config-files/policy-bad-at-console.conf
@@ -0,0 +1,4 @@
+<busconfig>
+  <listen>tcp:port=1234</listen>
+  <policy at_console="somewhere in the vicinity"/>
+</busconfig>
diff --git a/test/data/invalid-config-files/policy-bad-attribute.conf b/test/data/invalid-config-files/policy-bad-attribute.conf
new file mode 100644
index 00000000..03baeb08
--- /dev/null
+++ b/test/data/invalid-config-files/policy-bad-attribute.conf
@@ -0,0 +1,4 @@
+<busconfig>
+  <listen>tcp:port=1234</listen>
+  <policy hat="top"/>
+</busconfig>
diff --git a/test/data/invalid-config-files/policy-bad-context.conf b/test/data/invalid-config-files/policy-bad-context.conf
new file mode 100644
index 00000000..18ac25e0
--- /dev/null
+++ b/test/data/invalid-config-files/policy-bad-context.conf
@@ -0,0 +1,4 @@
+<busconfig>
+  <listen>tcp:port=1234</listen>
+  <policy context="apropos of nothing"/>
+</busconfig>
diff --git a/test/data/invalid-config-files/policy-bad-rule-attribute.conf b/test/data/invalid-config-files/policy-bad-rule-attribute.conf
new file mode 100644
index 00000000..b28a7b30
--- /dev/null
+++ b/test/data/invalid-config-files/policy-bad-rule-attribute.conf
@@ -0,0 +1,6 @@
+<busconfig>
+  <listen>tcp:port=1234</listen>
+  <policy context="default">
+    <allow species="stoat"/>
+  </policy>
+</busconfig>
diff --git a/test/data/invalid-config-files/policy-contradiction.conf b/test/data/invalid-config-files/policy-contradiction.conf
new file mode 100644
index 00000000..88bd73f6
--- /dev/null
+++ b/test/data/invalid-config-files/policy-contradiction.conf
@@ -0,0 +1,4 @@
+<busconfig>
+  <listen>tcp:port=1234</listen>
+  <policy user="root" at_console="true"/>
+</busconfig>
diff --git a/test/data/invalid-config-files/policy-member-no-path.conf b/test/data/invalid-config-files/policy-member-no-path.conf
new file mode 100644
index 00000000..9e6c89fd
--- /dev/null
+++ b/test/data/invalid-config-files/policy-member-no-path.conf
@@ -0,0 +1,6 @@
+<busconfig>
+  <listen>tcp:port=1234</listen>
+  <policy context="default">
+    <deny send_member="Reboot"/>
+  </policy>
+</busconfig>
diff --git a/test/data/invalid-config-files/policy-mixed.conf b/test/data/invalid-config-files/policy-mixed.conf
new file mode 100644
index 00000000..5549f239
--- /dev/null
+++ b/test/data/invalid-config-files/policy-mixed.conf
@@ -0,0 +1,6 @@
+<busconfig>
+  <listen>tcp:port=1234</listen>
+  <policy context="default">
+    <allow user="*" own="com.example.Bees"/>
+  </policy>
+</busconfig>
diff --git a/test/data/invalid-config-files/policy-no-attributes.conf b/test/data/invalid-config-files/policy-no-attributes.conf
new file mode 100644
index 00000000..d10c4964
--- /dev/null
+++ b/test/data/invalid-config-files/policy-no-attributes.conf
@@ -0,0 +1,4 @@
+<busconfig>
+  <listen>tcp:port=1234</listen>
+  <policy/>
+</busconfig>
diff --git a/test/data/invalid-config-files/policy-no-rule-attribute.conf b/test/data/invalid-config-files/policy-no-rule-attribute.conf
new file mode 100644
index 00000000..08ae4376
--- /dev/null
+++ b/test/data/invalid-config-files/policy-no-rule-attribute.conf
@@ -0,0 +1,6 @@
+<busconfig>
+  <listen>tcp:port=1234</listen>
+  <policy context="default">
+    <allow/>
+  </policy>
+</busconfig>
diff --git a/test/data/invalid-config-files/unknown-limit.conf b/test/data/invalid-config-files/unknown-limit.conf
new file mode 100644
index 00000000..43f8b290
--- /dev/null
+++ b/test/data/invalid-config-files/unknown-limit.conf
@@ -0,0 +1,4 @@
+<busconfig>
+  <listen>tcp:port=1234</listen>
+  <limit name="max_bees">5000</limit>
+</busconfig>
diff --git a/test/data/valid-config-files-system/many-rules.conf b/test/data/valid-config-files-system/many-rules.conf
index 8537fd90..8e893065 100644
--- a/test/data/valid-config-files-system/many-rules.conf
+++ b/test/data/valid-config-files-system/many-rules.conf
@@ -26,6 +26,7 @@
     <deny send_destination="org.freedesktop.Bar" send_interface="org.freedesktop.Foo"/>
     <deny send_destination="org.freedesktop.Bar" send_interface="org.freedesktop.Foo" send_type="method_call"/>
   </policy>
+  <apparmor mode="enabled"/>
 
   <policy context="mandatory">
     <allow user="*"/>
@@ -46,6 +47,10 @@
     <deny send_destination="org.freedesktop.Bar" send_interface="org.freedesktop.Foo" send_type="method_call"/>
   </policy>
 
+  <policy group="bin"/>
+  <policy at_console="true"/>
+  <policy at_console="false"/>
+
   <limit name="max_incoming_bytes">5000</limit>
   <limit name="max_outgoing_bytes">5000</limit>
   <limit name="max_message_size">300</limit>
diff --git a/test/data/valid-config-files/minimal.conf b/test/data/valid-config-files/minimal.conf
new file mode 100644
index 00000000..3fd2d341
--- /dev/null
+++ b/test/data/valid-config-files/minimal.conf
@@ -0,0 +1,3 @@
+<busconfig>
+  <listen>tcp:port=1234</listen>
+</busconfig>