diff --git a/tests/CMSMainTest.yml b/tests/CMSMainTest.yml
index 7ad281a5..9d0cb7d5 100644
--- a/tests/CMSMainTest.yml
+++ b/tests/CMSMainTest.yml
@@ -12,8 +12,10 @@ Page:
URLSegment: home
Group:
- admin:
- Title: Administrators
+ admin:
+ Title: Administrators
+ empty:
+ Title: Empty Group
Member:
admin:
diff --git a/tests/SecurityAdminTest.php b/tests/SecurityAdminTest.php
new file mode 100644
index 00000000..0f821d95
--- /dev/null
+++ b/tests/SecurityAdminTest.php
@@ -0,0 +1,35 @@
+session()->inst_set('loggedInAs', $this->idFromFixture('Member', 'admin'));
+
+ /* First, open the applicable group */
+ $this->get('admin/security/getitem?ID=' . $this->idFromFixture('Group','admin'));
+ $this->assertRegExp('/]+id="Form_EditForm_Title"[^>]+value="Administrators"[^>]*>/',$this->content());
+
+ /* Then load the export page */
+ $this->get('admin/security//EditForm/field/Members/export');
+
+ $this->assertRegExp('/"FirstName","Surname","Email"/', $this->content());
+ $this->assertRegExp('/"","","admin@example.com"/', $this->content());
+ }
+
+ function testEmptyGroupExport() {
+ $this->session()->inst_set('loggedInAs', $this->idFromFixture('Member', 'admin'));
+
+ /* First, open the applicable group */
+ $this->get('admin/security/getitem?ID=' . $this->idFromFixture('Group','empty'));
+ $this->assertRegExp('/]+id="Form_EditForm_Title"[^>]+value="Empty Group"[^>]*>/',$this->content());
+
+ /* Then load the export page */
+ $this->get('admin/security//EditForm/field/Members/export');
+
+ $this->assertRegExp('/"FirstName","Surname","Email"/', $this->content());
+ }
+
+}
+
+?>
\ No newline at end of file