diff --git a/test/Makefile b/test/Makefile
index e0dee956813..be22e17a040 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -42,10 +42,10 @@ QMTEST= QMTEST_CLASS_PATH=$(QMCLASSES) qmtest $(QMDB)
 # Execute the tests
 #
 qmtest:: $(LLVM_OBJ_ROOT)/test/tmp register
-	$(QMTEST) run -O $(LLVM_SRC_ROOT)/test/expectations.qmr $(CONTEXT)
+	$(QMTEST) run -O $(LLVM_SRC_ROOT)/test/QMTest/expectations.qmr $(CONTEXT)
 
 %.t:: $(LLVM_OBJ_ROOT)/test/tmp register
-	$(QMTEST) run -O $(LLVM_SRC_ROOT)/test/expectations.qmr $(CONTEXT) $*
+	$(QMTEST) run -O $(LLVM_SRC_ROOT)/test/QMTest/expectations.qmr $(CONTEXT) $*
 
 #
 # Create the temporary directory used by the test suite.
@@ -74,6 +74,7 @@ register:
 	$(QMTEST) register test llvm.AnalyzeTest
 	$(QMTEST) register test llvm.CTest
 	$(QMTEST) register test llvm.CXXTest
+	$(QMTEST) register database llvmdb.llvmdb
 	$(QMTEST) register resource llvm.BytecodeResource
 
 #