diff --git a/tests/handlers/views_handler_field_prerender_list.test b/tests/handlers/views_handler_field_prerender_list.test
new file mode 100644
index 0000000..1687c93
--- /dev/null
+++ b/tests/handlers/views_handler_field_prerender_list.test
@@ -0,0 +1,79 @@
+<?php
+
+/**
+ * @file
+ * Definition of ViewsHandlerFieldPreRenderTest
+ */
+
+/**
+ * Tests the prerender_list field handler.
+ *
+ * @see views_handler_field_prerender_list
+ */
+class ViewsHandlerFieldPreRenderTest extends ViewsSqlTest {
+  public static function getInfo() {
+    return array(
+      'name' => 'Field: Prerender list',
+      'description' => 'Test the core views_handler_field_prerender_list handler.',
+      'group' => 'Views Handlers',
+    );
+  }
+
+  protected function setUp() {
+    parent::setUp();
+    $this->column_map = array(
+      'views_test_name' => 'name',
+    );
+  }
+
+  function testRenderItem() {
+    $column_map_reversed = array_flip($this->column_map);
+
+    $view = $this->getBasicView();
+    $view->init_display();
+    $this->executeView($view);
+    $view->row_index = 0;
+
+    // Tests that the result is simply rendered as expected.
+    $random_name = $this->randomName();
+    $view->result[0]->{$column_map_reversed['name']} = $random_name;
+    $view->render();
+    $render = $view->field['name']->advanced_render($view->result[0]);
+    $this->assertIdentical($render, $random_name);
+
+    $view = $this->getBasicView();
+    $view->init_display();
+    $this->executeView($view);
+    $view->row_index = 0;
+
+    // Setup a empty result so take sure that the output is empty.
+    $view->result[0]->{$column_map_reversed['name']} = NULL;
+    $view->render();
+    $render = $view->field['name']->advanced_render($view->result[0]);
+    $this->assertFalse($render, 'An empty value should also lead to empty output.');
+
+    // Place the empty result at the second position of the result.
+    // Make sure that the second one is rendered as empty even the first one is
+    // not.
+    $view = $this->getBasicView();
+    $view->init_display();
+    $this->executeView($view);
+    $view->row_index = 0;
+
+    $view->result[0]->{$column_map_reversed['name']} = $random_name;
+    $view->result[1]->{$column_map_reversed['name']} = NULL;
+    $view->render();
+
+    $render = $view->field['name']->advanced_render($view->result[0]);
+    $this->assertIdentical($render, $random_name);
+
+    $render = $view->field['name']->advanced_render($view->result[1]);
+    $this->assertFalse($render);
+  }
+
+  protected function viewsData() {
+    $data = parent::viewsData();
+    $data['views_test']['name']['field']['handler'] = 'views_handler_field_test_render_item';
+    return $data;
+  }
+}
diff --git a/tests/handlers/views_handler_field_test_render_item.inc b/tests/handlers/views_handler_field_test_render_item.inc
new file mode 100644
index 0000000..e2b9c55
--- /dev/null
+++ b/tests/handlers/views_handler_field_test_render_item.inc
@@ -0,0 +1,27 @@
+<?php
+/**
+ * @file
+ * Definition of views_handler_field_test_render_item
+ */
+
+/**
+ * Example field handler which provides a render_item() method.
+ *
+ * Required for the test ViewsHandlerFieldPreRenderTest.
+ *
+ * @see views_field_handlers.
+ */
+class views_handler_field_test_render_item extends views_handler_field_prerender_list {
+  function render_item($row, $item) {
+    return render($item['rendered']);
+  }
+
+  function pre_render(&$result) {
+    foreach ($result as $row => $values) {
+      $value = $this->get_value($values, NULL, TRUE);
+      $this->items[$value] = array(array(
+        'rendered' => $value,
+      ));
+    }
+  }
+}
diff --git a/views.info b/views.info
index 24bf497..9eaca88 100644
--- a/views.info
+++ b/views.info
@@ -257,6 +257,8 @@ files[] = tests/handlers/views_handler_field_counter.test
 files[] = tests/handlers/views_handler_field_date.test
 files[] = tests/handlers/views_handler_field_file_size.test
 files[] = tests/handlers/views_handler_field_math.test
+files[] = tests/handlers/views_handler_field_prerender_list.test
+files[] = tests/handlers/views_handler_field_test_render_item.inc
 files[] = tests/handlers/views_handler_field_url.test
 files[] = tests/handlers/views_handler_field_xss.test
 files[] = tests/handlers/views_handler_filter_combine.test