diff --git a/spring-batch-infrastructure-tests/src/test/java/org/springframework/batch/item/database/IbatisPagingItemReaderAsyncTests.java b/spring-batch-infrastructure-tests/src/test/java/org/springframework/batch/item/database/IbatisPagingItemReaderAsyncTests.java
index a6c4f8a75..9f561a922 100644
--- a/spring-batch-infrastructure-tests/src/test/java/org/springframework/batch/item/database/IbatisPagingItemReaderAsyncTests.java
+++ b/spring-batch-infrastructure-tests/src/test/java/org/springframework/batch/item/database/IbatisPagingItemReaderAsyncTests.java
@@ -139,6 +139,8 @@ public class IbatisPagingItemReaderAsyncTests {
 		IbatisPagingItemReader<Foo> reader = new IbatisPagingItemReader<Foo>();
 		if ("postgres".equals(System.getProperty("ENVIRONMENT"))) {
 			reader.setQueryId("getPagedFoosPostgres");			
+		} else if ("oracle".equals(System.getProperty("ENVIRONMENT"))) {
+			reader.setQueryId("getPagedFoosOracle");			
 		} else {
 			reader.setQueryId("getPagedFoos");
 		}
diff --git a/spring-batch-infrastructure-tests/src/test/resources/batch-oracle.properties b/spring-batch-infrastructure-tests/src/test/resources/batch-oracle.properties
index 74c3d8b78..82d0fd0fd 100644
--- a/spring-batch-infrastructure-tests/src/test/resources/batch-oracle.properties
+++ b/spring-batch-infrastructure-tests/src/test/resources/batch-oracle.properties
@@ -1,7 +1,7 @@
 # Placeholders batch.*
 #    for Oracle:
 batch.jdbc.driver=oracle.jdbc.OracleDriver
-batch.jdbc.url=jdbc:oracle:thin:@oracle:1521:xe
+batch.jdbc.url=jdbc:oracle:thin:@localhost:1521:xe
 batch.jdbc.user=spring
 batch.jdbc.password=spring
 batch.jdbc.testWhileIdle=false
diff --git a/spring-batch-infrastructure-tests/src/test/resources/org/springframework/batch/item/database/JdbcPagingItemReaderCommonTests-context.xml b/spring-batch-infrastructure-tests/src/test/resources/org/springframework/batch/item/database/JdbcPagingItemReaderCommonTests-context.xml
index 2fe85e54a..79a377042 100644
--- a/spring-batch-infrastructure-tests/src/test/resources/org/springframework/batch/item/database/JdbcPagingItemReaderCommonTests-context.xml
+++ b/spring-batch-infrastructure-tests/src/test/resources/org/springframework/batch/item/database/JdbcPagingItemReaderCommonTests-context.xml
@@ -6,7 +6,7 @@
 
 	<import resource="classpath:/data-source-context.xml"/>
 
-	<!--  Initialise the database before every test case: -->
+	<!-- Override the default: -->
 	<bean id="dataSourceInitializer" class="test.jdbc.datasource.DataSourceInitializer">
 		<property name="dataSource" ref="dataSource"/>
 		<property name="initialize" value="${batch.data.source.init}"/>
diff --git a/spring-batch-infrastructure-tests/src/test/resources/org/springframework/batch/item/database/ibatis-foo.xml b/spring-batch-infrastructure-tests/src/test/resources/org/springframework/batch/item/database/ibatis-foo.xml
index 1eefeb966..307e03e5f 100644
--- a/spring-batch-infrastructure-tests/src/test/resources/org/springframework/batch/item/database/ibatis-foo.xml
+++ b/spring-batch-infrastructure-tests/src/test/resources/org/springframework/batch/item/database/ibatis-foo.xml
@@ -30,6 +30,10 @@
   	select ID, NAME, VALUE from T_FOOS order by ID LIMIT #_pagesize# OFFSET #_skiprows# 
   </select>
 
+  <select id="getPagedFoosOracle" resultMap="fooResult">
+  	select * from (select ID, NAME, VALUE, ROWNUM as tmp from T_FOOS order by ID) where tmp &gt; #_skiprows# and tmp&lt;=(#_skiprows#+#_pagesize#) 
+  </select>
+
   <select id="getAllFooIdsRestart" resultClass="int">
   	select ID from T_FOOS where ID > #id#
   </select>
diff --git a/spring-batch-samples/.settings/com.springsource.sts.config.flow.prefs b/spring-batch-samples/.settings/com.springsource.sts.config.flow.prefs
new file mode 100644
index 000000000..f6f1e6031
--- /dev/null
+++ b/spring-batch-samples/.settings/com.springsource.sts.config.flow.prefs
@@ -0,0 +1,3 @@
+#Mon May 17 10:38:33 BST 2010
+//com.springsource.sts.config.flow.coordinates\:http\://www.springframework.org/schema/batch\:/spring-batch-samples/src/main/resources/jobs/ioSampleJob.xml=<?xml version\="1.0" encoding\="UTF-8"?>\n<graph>\n<element type\="job">\n<structure end\="638" endstart\="632" start\="394" startend\="468"/>\n<bounds height\="118" width\="130" x\="15" y\="17"/>\n</element>\n</graph>
+eclipse.preferences.version=1