diff --git a/mdx/int_cobweb/beans.xml b/mdx/int_cobweb/beans.xml
index 67b9d2ea..2922f2fc 100644
--- a/mdx/int_cobweb/beans.xml
+++ b/mdx/int_cobweb/beans.xml
@@ -34,13 +34,8 @@
     <!--
         Signing certificate.
     -->
-    <bean id="int_cobweb_signingCertificate" parent="X509CertificateFactoryBean">
-        <property name="certificateFile">
-            <bean class="java.io.File">
-                <constructor-arg value="${basedir}/mdx/int_cobweb/cobweb.pem"/>
-            </bean>
-        </property>
-    </bean>
+    <bean id="int_cobweb_signingCertificate" parent="X509CertificateFactoryBean"
+        p:resource="classpath:int_cobweb/cobweb.pem"/>
     
     <!--
         Check signing signature.
diff --git a/mdx/test/beans.xml b/mdx/test/beans.xml
index be4fce06..2795c95b 100644
--- a/mdx/test/beans.xml
+++ b/mdx/test/beans.xml
@@ -15,15 +15,8 @@
     <!--
         Fetch the aggregate aggregate.
     -->
-    <bean id="test_aggregate" parent="stage_parent"
-        class="net.shibboleth.metadata.dom.DomFilesystemSourceStage">
-        <property name="parserPool" ref="parserPool"/>
-        <property name="source">
-            <bean class="java.io.File">
-                <constructor-arg value="${basedir}/mdx/test/input.xml"/>
-            </bean>
-        </property>
-    </bean>
+    <bean id="test_aggregate" parent="DOMResourceSourceStage"
+        p:DOMResource="classpath:test/input.xml"/>
     
     <!--
         Fetch and process the entities as a collection.
diff --git a/mdx/uk/beans.xml b/mdx/uk/beans.xml
index 87ee0297..bd769aa0 100644
--- a/mdx/uk/beans.xml
+++ b/mdx/uk/beans.xml
@@ -68,13 +68,8 @@
     <!--
         Metadata signing certificate.
     -->
-    <bean id="uk_signingCertificate" parent="X509CertificateFactoryBean">
-        <property name="certificateFile">
-            <bean class="java.io.File">
-                <constructor-arg value="${basedir}/mdx/uk/ukfederation-2014.pem"/>
-            </bean>
-        </property>
-    </bean>
+    <bean id="uk_signingCertificate" parent="X509CertificateFactoryBean"
+        p:resource="classpath:uk/ukfederation-2014.pem"/>
     
     
     <!--