diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/StaxEventItemReaderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/StaxEventItemReaderTests.java
index c10128dcf..eb7f4a12d 100644
--- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/StaxEventItemReaderTests.java
+++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/StaxEventItemReaderTests.java
@@ -47,6 +47,12 @@ public class StaxEventItemReaderTests {
 	// test xml input
 	private String xml = "<root> <fragment> <misc1/> </fragment> <misc2/> <fragment> testString </fragment> </root>";
 
+	// test xml input
+	private String emptyXml = "<root></root>";
+
+	// test xml input
+	private String missingXml = "<root><misc1/><misc2>foo</misc2></root>";
+
 	private String fooXml = "<root xmlns=\"urn:org.test.foo\"> <fragment> <misc1/> </fragment> <misc2/> <fragment> testString </fragment> </root>";
 
 	private String mixedXml = "<fragment xmlns=\"urn:org.test.foo\"> <fragment xmlns=\"urn:org.test.bar\"> <misc1/> </fragment> <misc2/> <fragment xmlns=\"urn:org.test.bar\"> testString </fragment> </fragment>";
@@ -176,6 +182,27 @@ public class StaxEventItemReaderTests {
 		assertFalse(source.moveCursorToNextFragment(reader));
 	}
 
+	/**
+	 * Empty document works OK.
+	 */
+	@Test
+	public void testMoveCursorToNextFragmentOnEmpty() throws XMLStreamException, FactoryConfigurationError, IOException {
+		Resource resource = new ByteArrayResource(emptyXml.getBytes());
+		XMLEventReader reader = XMLInputFactory.newInstance().createXMLEventReader(resource.getInputStream());
+
+		assertFalse(source.moveCursorToNextFragment(reader));
+	}
+
+	/**
+	 * Document with no fragments works OK.
+	 */
+	@Test
+	public void testMoveCursorToNextFragmentOnMissing() throws XMLStreamException, FactoryConfigurationError, IOException {
+		Resource resource = new ByteArrayResource(missingXml.getBytes());
+		XMLEventReader reader = XMLInputFactory.newInstance().createXMLEventReader(resource.getInputStream());
+		assertFalse(source.moveCursorToNextFragment(reader));
+	}
+
 	/**
 	 * Save restart data and restore from it.
 	 */