diff --git a/ndb/test/ndbapi/Makefile.am b/ndb/test/ndbapi/Makefile.am
index 6776ba966c1..97d839fe58c 100644
--- a/ndb/test/ndbapi/Makefile.am
+++ b/ndb/test/ndbapi/Makefile.am
@@ -25,6 +25,7 @@ testOperations \
 testRestartGci \
 testScan \
 testScanInterpreter \
+testScanPerf \
 testSystemRestart \
 testTimeout \
 testTransactions \
@@ -59,6 +60,7 @@ testOperations_SOURCES = testOperations.cpp
 testRestartGci_SOURCES = testRestartGci.cpp
 testScan_SOURCES = testScan.cpp
 testScanInterpreter_SOURCES = testScanInterpreter.cpp
+testScanPerf_SOURCES = testScanPerf.cpp
 testSystemRestart_SOURCES = testSystemRestart.cpp
 testTimeout_SOURCES = testTimeout.cpp
 testTransactions_SOURCES = testTransactions.cpp
diff --git a/ndb/test/ndbapi/testScanPerf/testScanPerf.cpp b/ndb/test/ndbapi/testScanPerf.cpp
similarity index 100%
rename from ndb/test/ndbapi/testScanPerf/testScanPerf.cpp
rename to ndb/test/ndbapi/testScanPerf.cpp
diff --git a/ndb/test/ndbapi/testScanPerf/Makefile b/ndb/test/ndbapi/testScanPerf/Makefile
deleted file mode 100644
index fdf5980b385..00000000000
--- a/ndb/test/ndbapi/testScanPerf/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-include .defs.mk
-
-TYPE =		ndbapitest
-
-BIN_TARGET =	testScanPerf
-
-SOURCES =	testScanPerf.cpp 
-
-include $(NDB_TOP)/Epilogue.mk