diff --git a/tests/security/MemberTest.php b/tests/security/MemberTest.php
index 4323599f5..a7361145d 100644
--- a/tests/security/MemberTest.php
+++ b/tests/security/MemberTest.php
@@ -13,6 +13,7 @@ class MemberTest extends SapphireTest {
 		Member::set_password_validator(null);
 
 		$member = $this->objFromFixture('Member', 'test');
+		$this->assertNotNull($member);
 		$member->Password = "test1";
 		$member->write();
 
@@ -45,6 +46,7 @@ class MemberTest extends SapphireTest {
 		$this->clearEmails();
 
 		$member = $this->objFromFixture('Member', 'test');
+		$this->assertNotNull($member);
 		$valid = $member->changePassword('32asDF##$$%%');
 		$this->assertTrue($valid->valid());
 		/*
@@ -60,6 +62,7 @@ class MemberTest extends SapphireTest {
 	 */
 	function testValidatePassword() {
 		$member = $this->objFromFixture('Member', 'test');
+		$this->assertNotNull($member);
 		
 		Member::set_password_validator(new NZGovtPasswordValidator());
 
@@ -143,6 +146,7 @@ class MemberTest extends SapphireTest {
 		Member::set_password_expiry(90);
 		
 		$member = $this->objFromFixture('Member', 'test');
+		$this->assertNotNull($member);
 		$valid = $member->changePassword("Xx?1234234");
 		$this->assertTrue($valid->valid());
 		
@@ -158,6 +162,7 @@ class MemberTest extends SapphireTest {
 	
 	function testIsPasswordExpired() {
 		$member = $this->objFromFixture('Member', 'test');
+		$this->assertNotNull($member);
 		$this->assertFalse($member->isPasswordExpired());
 
 		$member = $this->objFromFixture('Member', 'noexpiry');
diff --git a/tests/security/MemberTest.yml b/tests/security/MemberTest.yml
index 40d81475b..4da070669 100644
--- a/tests/security/MemberTest.yml
+++ b/tests/security/MemberTest.yml
@@ -1,18 +1,18 @@
 Member:
-    test:
-        FirstName: Test
-        Surname: User
-        Email: sam@silverstripe.com
-        Password: 1nitialPassword
-        PasswordExpiry: 2030-01-01
-    expiredpassword:
-        FirstName: Test
-        Surname: User
-        Email: expired@silverstripe.com
-        Password: 1nitialPassword
-        PasswordExpiry: 2006-01-01
-    noexpiry:
-        FirstName: Test
-        Surname: User
-        Email: noexpiry@silverstripe.com
-        Password: 1nitialPassword
+   test:
+      FirstName: Test
+      Surname: User
+      Email: sam@silverstripe.com
+      Password: 1nitialPassword
+      PasswordExpiry: 2030-01-01
+   expiredpassword:
+      FirstName: Test
+      Surname: User
+      Email: expired@silverstripe.com
+      Password: 1nitialPassword
+      PasswordExpiry: 2006-01-01
+   noexpiry:
+      FirstName: Test
+      Surname: User
+      Email: noexpiry@silverstripe.com
+      Password: 1nitialPassword