diff --git a/infrastructure/src/test/resources/org/springframework/batch/io/orm/hibernate/Foo-write.hbm.xml b/infrastructure/src/test/resources/org/springframework/batch/io/cursor/Foo-write.hbm.xml
similarity index 100%
rename from infrastructure/src/test/resources/org/springframework/batch/io/orm/hibernate/Foo-write.hbm.xml
rename to infrastructure/src/test/resources/org/springframework/batch/io/cursor/Foo-write.hbm.xml
diff --git a/infrastructure/src/test/resources/org/springframework/batch/io/orm/hibernate/Foo.hbm.xml b/infrastructure/src/test/resources/org/springframework/batch/io/cursor/Foo.hbm.xml
similarity index 100%
rename from infrastructure/src/test/resources/org/springframework/batch/io/orm/hibernate/Foo.hbm.xml
rename to infrastructure/src/test/resources/org/springframework/batch/io/cursor/Foo.hbm.xml
diff --git a/infrastructure/src/test/resources/org/springframework/batch/io/orm/ibatis/ibatis-config.xml b/infrastructure/src/test/resources/org/springframework/batch/io/driving/ibatis-config.xml
similarity index 81%
rename from infrastructure/src/test/resources/org/springframework/batch/io/orm/ibatis/ibatis-config.xml
rename to infrastructure/src/test/resources/org/springframework/batch/io/driving/ibatis-config.xml
index 3581245fd..e171484a3 100644
--- a/infrastructure/src/test/resources/org/springframework/batch/io/orm/ibatis/ibatis-config.xml
+++ b/infrastructure/src/test/resources/org/springframework/batch/io/driving/ibatis-config.xml
@@ -7,6 +7,6 @@
 		to false, input source would load all data into memory! -->
 	<settings lazyLoadingEnabled="true"/>
 
-	<sqlMap resource="org/springframework/batch/io/orm/ibatis/ibatis-foo.xml" />
+	<sqlMap resource="org/springframework/batch/io/driving/ibatis-foo.xml" />
 
 </sqlMapConfig>
\ No newline at end of file
diff --git a/infrastructure/src/test/resources/org/springframework/batch/io/orm/ibatis/ibatis-foo.xml b/infrastructure/src/test/resources/org/springframework/batch/io/driving/ibatis-foo.xml
similarity index 100%
rename from infrastructure/src/test/resources/org/springframework/batch/io/orm/ibatis/ibatis-foo.xml
rename to infrastructure/src/test/resources/org/springframework/batch/io/driving/ibatis-foo.xml