diff --git a/configure.ac b/configure.ac
index b11d6b42..496f7fd7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -550,6 +550,7 @@ AC_CONFIG_FILES(tests/forces/Makefile)
 AC_CONFIG_FILES(tests/hadrons/Makefile)
 AC_CONFIG_FILES(tests/hmc/Makefile)
 AC_CONFIG_FILES(tests/solver/Makefile)
+AC_CONFIG_FILES(tests/lanczos/Makefile)
 AC_CONFIG_FILES(tests/smearing/Makefile)
 AC_CONFIG_FILES(tests/qdpxx/Makefile)
 AC_CONFIG_FILES(tests/testu01/Makefile)
diff --git a/lib/algorithms/iterative/BlockImplicitlyRestartedLanczos/BlockImplicitlyRestartedLanczos.h b/lib/algorithms/iterative/BlockImplicitlyRestartedLanczos/BlockImplicitlyRestartedLanczos.h
index 82a00efa..55a85552 100644
--- a/lib/algorithms/iterative/BlockImplicitlyRestartedLanczos/BlockImplicitlyRestartedLanczos.h
+++ b/lib/algorithms/iterative/BlockImplicitlyRestartedLanczos/BlockImplicitlyRestartedLanczos.h
@@ -39,7 +39,6 @@ Author: Christoph Lehner <clehner@bnl.gov>
 #include <Grid/algorithms/iterative/BlockImplicitlyRestartedLanczos/BlockedGrid.h>
 #include <Grid/algorithms/iterative/BlockImplicitlyRestartedLanczos/FieldBasisVector.h>
 #include <Grid/algorithms/iterative/BlockImplicitlyRestartedLanczos/BlockProjector.h>
-#include <Grid/algorithms/iterative/BlockImplicitlyRestartedLanczos/FieldVectorIO.h>
 
 namespace Grid { 
 
diff --git a/tests/Makefile.am b/tests/Makefile.am
index a8935268..7928a7fe 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = . core forces hmc solver debug smearing IO
+SUBDIRS = . core forces hmc solver debug smearing IO lanczos
 
 if BUILD_CHROMA_REGRESSION
   SUBDIRS+= qdpxx
diff --git a/lib/algorithms/iterative/BlockImplicitlyRestartedLanczos/FieldVectorIO.h b/tests/lanczos/FieldVectorIO.h
similarity index 100%
rename from lib/algorithms/iterative/BlockImplicitlyRestartedLanczos/FieldVectorIO.h
rename to tests/lanczos/FieldVectorIO.h
diff --git a/tests/lanczos/Makefile.am b/tests/lanczos/Makefile.am
new file mode 100644
index 00000000..60b82dd7
--- /dev/null
+++ b/tests/lanczos/Makefile.am
@@ -0,0 +1 @@
+include Make.inc
diff --git a/tests/solver/Params.h b/tests/lanczos/Params.h
similarity index 100%
rename from tests/solver/Params.h
rename to tests/lanczos/Params.h
diff --git a/tests/solver/Test_dwf_compressed_lanczos.cc b/tests/lanczos/Test_dwf_compressed_lanczos.cc
similarity index 99%
rename from tests/solver/Test_dwf_compressed_lanczos.cc
rename to tests/lanczos/Test_dwf_compressed_lanczos.cc
index b42a2d55..7fe37387 100644
--- a/tests/solver/Test_dwf_compressed_lanczos.cc
+++ b/tests/lanczos/Test_dwf_compressed_lanczos.cc
@@ -21,9 +21,9 @@
     (ortho krylov low poly); and then fix up lowest say 200 eigenvalues by 1 run with high-degree poly (600 could be enough)
 */
 #include <Grid/Grid.h>
-#include "Params.h"
-
 #include <Grid/algorithms/iterative/BlockImplicitlyRestartedLanczos/BlockImplicitlyRestartedLanczos.h>
+#include "FieldVectorIO.h"
+#include "Params.h"
 
 using namespace std;
 using namespace Grid;
diff --git a/tests/solver/Test_dwf_lanczos.cc b/tests/lanczos/Test_dwf_lanczos.cc
similarity index 100%
rename from tests/solver/Test_dwf_lanczos.cc
rename to tests/lanczos/Test_dwf_lanczos.cc
diff --git a/tests/debug/Test_synthetic_lanczos.cc b/tests/lanczos/Test_synthetic_lanczos.cc
similarity index 100%
rename from tests/debug/Test_synthetic_lanczos.cc
rename to tests/lanczos/Test_synthetic_lanczos.cc
diff --git a/tests/solver/Test_wilson_lanczos.cc b/tests/lanczos/Test_wilson_lanczos.cc
similarity index 100%
rename from tests/solver/Test_wilson_lanczos.cc
rename to tests/lanczos/Test_wilson_lanczos.cc