diff --git a/lib/xpath b/lib/xpath
index 0d789dee9..123edcb55 160000
--- a/lib/xpath
+++ b/lib/xpath
@@ -1 +1 @@
-Subproject commit 0d789dee9ac1fdd0e9b0b3e4ce9bbf6f6dadf465
+Subproject commit 123edcb55a4e711a6beab4006b19726464c974e8
diff --git a/require-config.js b/require-config.js
index 6e726a3c6..1ab993356 100644
--- a/require-config.js
+++ b/require-config.js
@@ -6,7 +6,7 @@ require.config( {
         "enketo-config": "../config.json",
         "require-config": "../require-config", // required for build task
         "text": "text/text",
-        "xpath": "xpath/build/xpathjs_javarosa",
+        "xpath": "xpath/build/enketo-xpathjs",
         "file-manager": "../src/js/file-manager",
         "jquery": "bower-components/jquery/dist/jquery",
         "jquery.xpath": "jquery-xpath/jquery.xpath",
diff --git a/test/karma.conf.js b/test/karma.conf.js
index ff9bd40b2..96bb39d4c 100644
--- a/test/karma.conf.js
+++ b/test/karma.conf.js
@@ -54,7 +54,7 @@ module.exports = function( config ) {
                 pattern: 'lib/Modernizr.js',
                 included: false
             }, {
-                pattern: 'lib/xpath/build/xpathjs_javarosa.js',
+                pattern: 'lib/xpath/build/enketo-xpathjs.js',
                 included: false
             }, {
                 pattern: 'lib/bower-components/jquery/dist/jquery.js',