diff --git a/org.springframework.testsuite/src/test/java/org/springframework/web/portlet/context/WEB-INF/resources/messageSource.xml b/org.springframework.testsuite/src/test/java/org/springframework/web/portlet/context/WEB-INF/resources/messageSource.xml
new file mode 100644
index 00000000000..58e00ac37eb
--- /dev/null
+++ b/org.springframework.testsuite/src/test/java/org/springframework/web/portlet/context/WEB-INF/resources/messageSource.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+
+<beans>
+
+	<bean id="messageSource" class="org.springframework.context.support.ResourceBundleMessageSource">
+		<property name="useCodeAsDefaultMessage">
+			<value>${useCodeAsDefaultMessage}</value>
+		</property>
+		<property name="basenames">
+			<list>
+				<value>org/springframework/web/portlet/context/WEB-INF/${message-file}</value>
+				<value>org/springframework/web/portlet/context/WEB-INF/more-context-messages</value>
+			</list>
+		</property>
+	</bean>
+
+	<bean id="messageSourceString" factory-bean="messageSource" factory-method="toString"/>
+
+	<bean id="currentTimeMillis" class="javax.management.ObjectName" factory-method="getInstance">
+		<constructor-arg value="${objectName}"/>
+	</bean>
+
+</beans>
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/web/portlet/context/WEB-INF/resources/themeSource.xml b/org.springframework.testsuite/src/test/java/org/springframework/web/portlet/context/WEB-INF/resources/themeSource.xml
new file mode 100644
index 00000000000..1e7d04517db
--- /dev/null
+++ b/org.springframework.testsuite/src/test/java/org/springframework/web/portlet/context/WEB-INF/resources/themeSource.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+
+<beans>
+
+	<bean id="themeSource" class="org.springframework.ui.context.support.ResourceBundleThemeSource">
+		<property name="basenamePrefix">
+			<value>${theme-base}</value>
+		</property>
+	</bean>
+
+</beans>