diff --git a/modules/database/test/ioc/dbtemplate/msi.plt b/modules/database/test/ioc/dbtemplate/msi.plt
index 09835d3ac..e8b9bb900 100644
--- a/modules/database/test/ioc/dbtemplate/msi.plt
+++ b/modules/database/test/ioc/dbtemplate/msi.plt
@@ -57,10 +57,10 @@ ok(msi('-I. -I.. -S ../t12-substitute.txt'), slurp('../t12-result.txt'));
 delete @ENV{ keys %envs };  # Not really needed
 
 # Substitution file, relative path includes
-ok(msi('-I @TOP@/modules -S ../t13-substitute.txt'), slurp('../t13-result.txt'));
+ok(msi('-I ../.. -S ../t13-substitute.txt'), slurp('../t13-result.txt'));
 
 # Template file, relative path includes
-ok(msi('-I @TOP@/modules ../t14-template.txt'), slurp('../t14-result.txt'));
+ok(msi('-I ../.. ../t14-template.txt'), slurp('../t14-result.txt'));
 
 # Test support routines
 
diff --git a/modules/database/test/ioc/dbtemplate/t13-substitute.txt b/modules/database/test/ioc/dbtemplate/t13-substitute.txt
index 63d3fca1f..5890df7f3 100644
--- a/modules/database/test/ioc/dbtemplate/t13-substitute.txt
+++ b/modules/database/test/ioc/dbtemplate/t13-substitute.txt
@@ -1,3 +1,3 @@
-file database/test/ioc/dbtemplate/t13-template.txt {
+file dbtemplate/t13-template.txt {
     { a=foo }
 }
diff --git a/modules/database/test/ioc/dbtemplate/t14-template.txt b/modules/database/test/ioc/dbtemplate/t14-template.txt
index 276663f7a..b1de6175a 100644
--- a/modules/database/test/ioc/dbtemplate/t14-template.txt
+++ b/modules/database/test/ioc/dbtemplate/t14-template.txt
@@ -1,5 +1,5 @@
 This is t14-template.txt
 
-include "database/test/ioc/dbtemplate/t14-include.txt"
+include "dbtemplate/t14-include.txt"
 
 End of t14-template.txt