diff --git a/core/tests/Drupal/Tests/Core/Batch/BatchNotFoundTest.php b/core/tests/Drupal/Tests/Core/Batch/BatchNotFoundTest.php
new file mode 100644
index 0000000..0e44f24
--- /dev/null
+++ b/core/tests/Drupal/Tests/Core/Batch/BatchNotFoundTest.php
@@ -0,0 +1,45 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\Core\Batch\BatchNotFoundTest.
+ */
+
+namespace Drupal\Tests\Core\Batch;
+
+use Drupal\simpletest\WebTestBase;
+
+/**
+ * Tests if Drupal returns page not found error when batch ID does not exist.
+ *
+ * @group Batch
+ */
+class BatchNotFoundTest extends WebTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = array('batch_test');
+
+  /**
+   * Tests for page not found error if batch ID does not exist.
+   */
+  public function testBatchNotFound() {
+    $edit = array('batch' => 'batch_0');
+    $this->drupalPostForm('batch-test', $edit, 'Submit');
+
+    $batch_id = db_next_id();
+
+    $this->drupalGet('batch', array(
+      'query' => array(
+        'op' => 'start',
+        'id' => $batch_id,
+      ),
+    ));
+
+    $this->assertResponse(404);
+  }
+
+}