diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3336fbc5..d41e1c4f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -647,5 +647,5 @@ install(FILES "${PROJECT_BINARY_DIR}/tmp/misc/armadillo.pc" DESTINATION ${CMAKE_
 if(BUILD_SMOKE_TEST)
   message(STATUS "*** configuring smoke_test")
   enable_testing()
-  add_subdirectory(smoke_test)
+  add_subdirectory(tests1)
 endif()
diff --git a/smoke_test/CMakeLists.txt b/tests1/CMakeLists.txt
similarity index 100%
rename from smoke_test/CMakeLists.txt
rename to tests1/CMakeLists.txt
diff --git a/smoke_test/smoke_test.cpp b/tests1/smoke_test.cpp
similarity index 100%
rename from smoke_test/smoke_test.cpp
rename to tests1/smoke_test.cpp
diff --git a/tests/Makefile b/tests2/Makefile
similarity index 100%
rename from tests/Makefile
rename to tests2/Makefile
diff --git a/tests/README.txt b/tests2/README.txt
similarity index 100%
rename from tests/README.txt
rename to tests2/README.txt
diff --git a/tests/attributes.cpp b/tests2/attributes.cpp
similarity index 100%
rename from tests/attributes.cpp
rename to tests2/attributes.cpp
diff --git a/tests/bounds.cpp b/tests2/bounds.cpp
similarity index 100%
rename from tests/bounds.cpp
rename to tests2/bounds.cpp
diff --git a/tests/catch.hpp b/tests2/catch.hpp
similarity index 100%
rename from tests/catch.hpp
rename to tests2/catch.hpp
diff --git a/tests/decomp_eig_gen.cpp b/tests2/decomp_eig_gen.cpp
similarity index 100%
rename from tests/decomp_eig_gen.cpp
rename to tests2/decomp_eig_gen.cpp
diff --git a/tests/decomp_eig_pair.cpp b/tests2/decomp_eig_pair.cpp
similarity index 100%
rename from tests/decomp_eig_pair.cpp
rename to tests2/decomp_eig_pair.cpp
diff --git a/tests/decomp_eig_sym.cpp b/tests2/decomp_eig_sym.cpp
similarity index 100%
rename from tests/decomp_eig_sym.cpp
rename to tests2/decomp_eig_sym.cpp
diff --git a/tests/expr_elem.cpp b/tests2/expr_elem.cpp
similarity index 100%
rename from tests/expr_elem.cpp
rename to tests2/expr_elem.cpp
diff --git a/tests/expr_misc.cpp b/tests2/expr_misc.cpp
similarity index 100%
rename from tests/expr_misc.cpp
rename to tests2/expr_misc.cpp
diff --git a/tests/fn_abs.cpp b/tests2/fn_abs.cpp
similarity index 100%
rename from tests/fn_abs.cpp
rename to tests2/fn_abs.cpp
diff --git a/tests/fn_accu.cpp b/tests2/fn_accu.cpp
similarity index 100%
rename from tests/fn_accu.cpp
rename to tests2/fn_accu.cpp
diff --git a/tests/fn_all.cpp b/tests2/fn_all.cpp
similarity index 100%
rename from tests/fn_all.cpp
rename to tests2/fn_all.cpp
diff --git a/tests/fn_any.cpp b/tests2/fn_any.cpp
similarity index 100%
rename from tests/fn_any.cpp
rename to tests2/fn_any.cpp
diff --git a/tests/fn_as_scalar.cpp b/tests2/fn_as_scalar.cpp
similarity index 100%
rename from tests/fn_as_scalar.cpp
rename to tests2/fn_as_scalar.cpp
diff --git a/tests/fn_clamp.cpp b/tests2/fn_clamp.cpp
similarity index 100%
rename from tests/fn_clamp.cpp
rename to tests2/fn_clamp.cpp
diff --git a/tests/fn_cond.cpp b/tests2/fn_cond.cpp
similarity index 100%
rename from tests/fn_cond.cpp
rename to tests2/fn_cond.cpp
diff --git a/tests/fn_conj.cpp b/tests2/fn_conj.cpp
similarity index 100%
rename from tests/fn_conj.cpp
rename to tests2/fn_conj.cpp
diff --git a/tests/fn_conv.cpp b/tests2/fn_conv.cpp
similarity index 100%
rename from tests/fn_conv.cpp
rename to tests2/fn_conv.cpp
diff --git a/tests/fn_conv_to.cpp b/tests2/fn_conv_to.cpp
similarity index 100%
rename from tests/fn_conv_to.cpp
rename to tests2/fn_conv_to.cpp
diff --git a/tests/fn_cor.cpp b/tests2/fn_cor.cpp
similarity index 100%
rename from tests/fn_cor.cpp
rename to tests2/fn_cor.cpp
diff --git a/tests/fn_cov.cpp b/tests2/fn_cov.cpp
similarity index 100%
rename from tests/fn_cov.cpp
rename to tests2/fn_cov.cpp
diff --git a/tests/fn_cross.cpp b/tests2/fn_cross.cpp
similarity index 100%
rename from tests/fn_cross.cpp
rename to tests2/fn_cross.cpp
diff --git a/tests/fn_cumprod.cpp b/tests2/fn_cumprod.cpp
similarity index 100%
rename from tests/fn_cumprod.cpp
rename to tests2/fn_cumprod.cpp
diff --git a/tests/fn_cumsum.cpp b/tests2/fn_cumsum.cpp
similarity index 100%
rename from tests/fn_cumsum.cpp
rename to tests2/fn_cumsum.cpp
diff --git a/tests/fn_det.cpp b/tests2/fn_det.cpp
similarity index 100%
rename from tests/fn_det.cpp
rename to tests2/fn_det.cpp
diff --git a/tests/fn_diagmat.cpp b/tests2/fn_diagmat.cpp
similarity index 100%
rename from tests/fn_diagmat.cpp
rename to tests2/fn_diagmat.cpp
diff --git a/tests/fn_diagvec.cpp b/tests2/fn_diagvec.cpp
similarity index 100%
rename from tests/fn_diagvec.cpp
rename to tests2/fn_diagvec.cpp
diff --git a/tests/fn_diff.cpp b/tests2/fn_diff.cpp
similarity index 100%
rename from tests/fn_diff.cpp
rename to tests2/fn_diff.cpp
diff --git a/tests/fn_dot.cpp b/tests2/fn_dot.cpp
similarity index 100%
rename from tests/fn_dot.cpp
rename to tests2/fn_dot.cpp
diff --git a/tests/fn_eigs_gen.cpp b/tests2/fn_eigs_gen.cpp
similarity index 100%
rename from tests/fn_eigs_gen.cpp
rename to tests2/fn_eigs_gen.cpp
diff --git a/tests/fn_eigs_sym.cpp b/tests2/fn_eigs_sym.cpp
similarity index 100%
rename from tests/fn_eigs_sym.cpp
rename to tests2/fn_eigs_sym.cpp
diff --git a/tests/fn_eps.cpp b/tests2/fn_eps.cpp
similarity index 100%
rename from tests/fn_eps.cpp
rename to tests2/fn_eps.cpp
diff --git a/tests/fn_expmat.cpp b/tests2/fn_expmat.cpp
similarity index 100%
rename from tests/fn_expmat.cpp
rename to tests2/fn_expmat.cpp
diff --git a/tests/fn_find.cpp b/tests2/fn_find.cpp
similarity index 100%
rename from tests/fn_find.cpp
rename to tests2/fn_find.cpp
diff --git a/tests/fn_find_finite.cpp b/tests2/fn_find_finite.cpp
similarity index 100%
rename from tests/fn_find_finite.cpp
rename to tests2/fn_find_finite.cpp
diff --git a/tests/fn_find_nonfinite.cpp b/tests2/fn_find_nonfinite.cpp
similarity index 100%
rename from tests/fn_find_nonfinite.cpp
rename to tests2/fn_find_nonfinite.cpp
diff --git a/tests/fn_find_unique.cpp b/tests2/fn_find_unique.cpp
similarity index 100%
rename from tests/fn_find_unique.cpp
rename to tests2/fn_find_unique.cpp
diff --git a/tests/fn_flip.cpp b/tests2/fn_flip.cpp
similarity index 100%
rename from tests/fn_flip.cpp
rename to tests2/fn_flip.cpp
diff --git a/tests/fn_hess.cpp b/tests2/fn_hess.cpp
similarity index 100%
rename from tests/fn_hess.cpp
rename to tests2/fn_hess.cpp
diff --git a/tests/fn_interp1.cpp b/tests2/fn_interp1.cpp
similarity index 100%
rename from tests/fn_interp1.cpp
rename to tests2/fn_interp1.cpp
diff --git a/tests/fn_intersect.cpp b/tests2/fn_intersect.cpp
similarity index 100%
rename from tests/fn_intersect.cpp
rename to tests2/fn_intersect.cpp
diff --git a/tests/fn_is_finite.cpp b/tests2/fn_is_finite.cpp
similarity index 100%
rename from tests/fn_is_finite.cpp
rename to tests2/fn_is_finite.cpp
diff --git a/tests/fn_max.cpp b/tests2/fn_max.cpp
similarity index 100%
rename from tests/fn_max.cpp
rename to tests2/fn_max.cpp
diff --git a/tests/fn_mean.cpp b/tests2/fn_mean.cpp
similarity index 100%
rename from tests/fn_mean.cpp
rename to tests2/fn_mean.cpp
diff --git a/tests/fn_min.cpp b/tests2/fn_min.cpp
similarity index 100%
rename from tests/fn_min.cpp
rename to tests2/fn_min.cpp
diff --git a/tests/fn_princomp.cpp b/tests2/fn_princomp.cpp
similarity index 100%
rename from tests/fn_princomp.cpp
rename to tests2/fn_princomp.cpp
diff --git a/tests/fn_spsolve.cpp b/tests2/fn_spsolve.cpp
similarity index 100%
rename from tests/fn_spsolve.cpp
rename to tests2/fn_spsolve.cpp
diff --git a/tests/fn_sum.cpp b/tests2/fn_sum.cpp
similarity index 100%
rename from tests/fn_sum.cpp
rename to tests2/fn_sum.cpp
diff --git a/tests/fn_symmat.cpp b/tests2/fn_symmat.cpp
similarity index 100%
rename from tests/fn_symmat.cpp
rename to tests2/fn_symmat.cpp
diff --git a/tests/fn_trace.cpp b/tests2/fn_trace.cpp
similarity index 100%
rename from tests/fn_trace.cpp
rename to tests2/fn_trace.cpp
diff --git a/tests/fn_trans.cpp b/tests2/fn_trans.cpp
similarity index 100%
rename from tests/fn_trans.cpp
rename to tests2/fn_trans.cpp
diff --git a/tests/fn_var.cpp b/tests2/fn_var.cpp
similarity index 100%
rename from tests/fn_var.cpp
rename to tests2/fn_var.cpp
diff --git a/tests/fn_vectorise.cpp b/tests2/fn_vectorise.cpp
similarity index 100%
rename from tests/fn_vectorise.cpp
rename to tests2/fn_vectorise.cpp
diff --git a/tests/gen_linspace.cpp b/tests2/gen_linspace.cpp
similarity index 100%
rename from tests/gen_linspace.cpp
rename to tests2/gen_linspace.cpp
diff --git a/tests/gen_ones.cpp b/tests2/gen_ones.cpp
similarity index 100%
rename from tests/gen_ones.cpp
rename to tests2/gen_ones.cpp
diff --git a/tests/gen_randu.cpp b/tests2/gen_randu.cpp
similarity index 100%
rename from tests/gen_randu.cpp
rename to tests2/gen_randu.cpp
diff --git a/tests/gen_zeros.cpp b/tests2/gen_zeros.cpp
similarity index 100%
rename from tests/gen_zeros.cpp
rename to tests2/gen_zeros.cpp
diff --git a/tests/gmm.cpp b/tests2/gmm.cpp
similarity index 100%
rename from tests/gmm.cpp
rename to tests2/gmm.cpp
diff --git a/tests/hdf5.cpp b/tests2/hdf5.cpp
similarity index 100%
rename from tests/hdf5.cpp
rename to tests2/hdf5.cpp
diff --git a/tests/init_auxmem.cpp b/tests2/init_auxmem.cpp
similarity index 100%
rename from tests/init_auxmem.cpp
rename to tests2/init_auxmem.cpp
diff --git a/tests/init_fill.cpp b/tests2/init_fill.cpp
similarity index 100%
rename from tests/init_fill.cpp
rename to tests2/init_fill.cpp
diff --git a/tests/init_misc.cpp b/tests2/init_misc.cpp
similarity index 100%
rename from tests/init_misc.cpp
rename to tests2/init_misc.cpp
diff --git a/tests/instantiation.cpp b/tests2/instantiation.cpp
similarity index 100%
rename from tests/instantiation.cpp
rename to tests2/instantiation.cpp
diff --git a/tests/main.cpp b/tests2/main.cpp
similarity index 100%
rename from tests/main.cpp
rename to tests2/main.cpp
diff --git a/tests/mat_minus.cpp b/tests2/mat_minus.cpp
similarity index 100%
rename from tests/mat_minus.cpp
rename to tests2/mat_minus.cpp
diff --git a/tests/mat_mul_cx.cpp b/tests2/mat_mul_cx.cpp
similarity index 100%
rename from tests/mat_mul_cx.cpp
rename to tests2/mat_mul_cx.cpp
diff --git a/tests/mat_mul_real.cpp b/tests2/mat_mul_real.cpp
similarity index 100%
rename from tests/mat_mul_real.cpp
rename to tests2/mat_mul_real.cpp
diff --git a/tests/mat_neg.cpp b/tests2/mat_neg.cpp
similarity index 100%
rename from tests/mat_neg.cpp
rename to tests2/mat_neg.cpp
diff --git a/tests/mat_plus.cpp b/tests2/mat_plus.cpp
similarity index 100%
rename from tests/mat_plus.cpp
rename to tests2/mat_plus.cpp
diff --git a/tests/spcol.cpp b/tests2/spcol.cpp
similarity index 100%
rename from tests/spcol.cpp
rename to tests2/spcol.cpp
diff --git a/tests/spmat.cpp b/tests2/spmat.cpp
similarity index 100%
rename from tests/spmat.cpp
rename to tests2/spmat.cpp
diff --git a/tests/sprow.cpp b/tests2/sprow.cpp
similarity index 100%
rename from tests/sprow.cpp
rename to tests2/sprow.cpp
diff --git a/tests/spsubview.cpp b/tests2/spsubview.cpp
similarity index 100%
rename from tests/spsubview.cpp
rename to tests2/spsubview.cpp