diff --git a/build.xml b/build.xml
index 38e8fb3d..9dbc2387 100644
--- a/build.xml
+++ b/build.xml
@@ -609,7 +609,7 @@
         <attribute name="i"/>
         <sequential>
             <MDT i="@{i}" o="${null.device}"
-                keystore="${build.dir}/ukfederation-2012.jks"
+                keystore="${mdx.dir}/uk/ukfederation-2012.jks"
                 alias="${keystore.uk.vfy.alias}"/>
         </sequential>
     </macrodef>
@@ -702,7 +702,7 @@
                 <args>
                     <arg value="--verifySignature"/>
                     <arg value="--certificate"/>
-                    <arg value="${build.dir}/ukfederation-2012.pem"/>
+                    <arg value="${mdx.dir}/uk/ukfederation-2012.pem"/>
                     <!--
                     <arg value="- -quiet"/>
                     -->
diff --git a/build/ukfederation-2012.jks b/mdx/uk/ukfederation-2012.jks
similarity index 100%
rename from build/ukfederation-2012.jks
rename to mdx/uk/ukfederation-2012.jks
diff --git a/build/ukfederation-2012.pem b/mdx/uk/ukfederation-2012.pem
similarity index 100%
rename from build/ukfederation-2012.pem
rename to mdx/uk/ukfederation-2012.pem