diff --git a/tests/model/DataObjectTest.php b/tests/model/DataObjectTest.php
index aabae2827..235837fa7 100644
--- a/tests/model/DataObjectTest.php
+++ b/tests/model/DataObjectTest.php
@@ -1051,7 +1051,11 @@ class DataObjectTest_Team extends DataObject implements TestOnly {
 			'Position' => 'Varchar(100)'
 		)
 	);
-	
+
+	function MyTitle() {
+		return 'Team ' . $this->Title;
+	}
+
 	function getDynamicField() {
 		return 'dynamicfield';
 	}
diff --git a/tests/model/MapTest.php b/tests/model/MapTest.php
index fc9aa64f6..025c15cf5 100755
--- a/tests/model/MapTest.php
+++ b/tests/model/MapTest.php
@@ -68,6 +68,20 @@ class SS_MapTest extends SapphireTest {
 		), $map->keys());
 	}
 
+	function testMethodAsValueField() {
+		$list = DataList::create('DataObjectTest_Team');
+		$list->sort('Title');
+		$map = new SS_Map($list, 'ID', 'MyTitle');
+		$this->assertEquals(array(
+			'Team Subteam 1',
+			'Team Subteam 2',
+			'Team Subteam 3',
+			'Team Team 1',
+			'Team Team 2',
+			'Team Team 3'
+		), $map->values());
+	}
+
 	function testValues() {
 		$list = DataList::create('DataObjectTest_TeamComment');
 		$list->sort('Name');
@@ -129,4 +143,4 @@ class SS_MapTest extends SapphireTest {
 
 	}
 	
-}
\ No newline at end of file
+}