diff --git a/tests/unit/ax/Makefile.in b/tests/unit/ax/Makefile.in
index 7e7cb44a523c..9644e156a7a2 100644
--- a/tests/unit/ax/Makefile.in
+++ b/tests/unit/ax/Makefile.in
@@ -4,12 +4,22 @@ endif
 FFLAGS += $(PFUNIT_EXTRA_FFLAGS) @NEKO_PKG_FCFLAGS@ -I@top_builddir@/src
 FC = @FC@
 
-%.o : %.F90
+# Depend on the library so the test objects follow any change to Neko.
+NEKO_LIB := $(wildcard @top_builddir@/src/libneko.la)
+
+%.o : %.F90 $(NEKO_LIB)
 	$(FC) -c $(FFLAGS) $<
 
 
 check: ax_test
 
+# Regenerate this Makefile from Makefile.in via config.status
+# whenever it changes.
+SUBDIR := $(patsubst $(abspath @top_builddir@)/%,%,$(CURDIR))
+
+Makefile: Makefile.in @top_builddir@/config.status
+	cd @top_builddir@ && $(SHELL) ./config.status $(SUBDIR)/Makefile
+
 
 ax_test_TESTS := test_ax_factory.pf
 ax_test_OTHER_LIBRARIES = -L@top_builddir@/src/.libs/ -lneko @LDFLAGS@ @LIBS@
diff --git a/tests/unit/bc/Makefile.in b/tests/unit/bc/Makefile.in
index 34f76727cd83..59609cf33e39 100644
--- a/tests/unit/bc/Makefile.in
+++ b/tests/unit/bc/Makefile.in
@@ -5,13 +5,23 @@ endif
 FFLAGS += $(PFUNIT_EXTRA_FFLAGS) @NEKO_PKG_FCFLAGS@ -I@top_builddir@/src
 FC = @FC@
 
-%.o : %.F90
+# Depend on the library so the test objects follow any change to Neko.
+NEKO_LIB := $(wildcard @top_builddir@/src/libneko.la)
+
+%.o : %.F90 $(NEKO_LIB)
 	$(FC) -c $(FFLAGS) $<
 
 mesh_fixture.o : ../fixtures/mesh_fixture.f90
 	$(FC) -c $(FFLAGS) -o mesh_fixture.o $<
 mesh_fixture.mod : mesh_fixture.o
 
+# Regenerate this Makefile from Makefile.in via config.status
+# whenever it changes.
+SUBDIR := $(patsubst $(abspath @top_builddir@)/%,%,$(CURDIR))
+
+Makefile: Makefile.in @top_builddir@/config.status
+	cd @top_builddir@ && $(SHELL) ./config.status $(SUBDIR)/Makefile
+
 
 check: bc_suite
 
diff --git a/tests/unit/bc_projector/Makefile.in b/tests/unit/bc_projector/Makefile.in
index bb15b07b8da0..7dcab170ebad 100644
--- a/tests/unit/bc_projector/Makefile.in
+++ b/tests/unit/bc_projector/Makefile.in
@@ -5,7 +5,10 @@ endif
 FFLAGS += $(PFUNIT_EXTRA_FFLAGS) @NEKO_PKG_FCFLAGS@ -I@top_builddir@/src
 FC = @FC@
 
-%.o : %.F90
+# Depend on the library so the test objects follow any change to Neko.
+NEKO_LIB := $(wildcard @top_builddir@/src/libneko.la)
+
+%.o : %.F90 $(NEKO_LIB)
 	$(FC) -c $(FFLAGS) $<
 
 ../fixtures/mesh_fixture.o : ../fixtures/mesh_fixture.f90
@@ -14,6 +17,13 @@ FC = @FC@
 
 check: bc_projector_suite
 
+# Regenerate this Makefile from Makefile.in via config.status
+# whenever it changes.
+SUBDIR := $(patsubst $(abspath @top_builddir@)/%,%,$(CURDIR))
+
+Makefile: Makefile.in @top_builddir@/config.status
+	cd @top_builddir@ && $(SHELL) ./config.status $(SUBDIR)/Makefile
+
 
 bc_projector_suite_TESTS := test_bc_projector.pf\
     test_coupled_bc_projector.pf
diff --git a/tests/unit/boundary_operation/Makefile.in b/tests/unit/boundary_operation/Makefile.in
index 64bd16782a6f..0912135e31e6 100644
--- a/tests/unit/boundary_operation/Makefile.in
+++ b/tests/unit/boundary_operation/Makefile.in
@@ -5,12 +5,22 @@ endif
 FFLAGS += $(PFUNIT_EXTRA_FFLAGS) @NEKO_PKG_FCFLAGS@ -I@top_builddir@/src
 FC = @FC@
 
-%.o : %.F90
+# Depend on the library so the test objects follow any change to Neko.
+NEKO_LIB := $(wildcard @top_builddir@/src/libneko.la)
+
+%.o : %.F90 $(NEKO_LIB)
 	$(FC) -c $(FFLAGS) $<
 
 
 check: boundary_operation_suite
 
+# Regenerate this Makefile from Makefile.in via config.status
+# whenever it changes.
+SUBDIR := $(patsubst $(abspath @top_builddir@)/%,%,$(CURDIR))
+
+Makefile: Makefile.in @top_builddir@/config.status
+	cd @top_builddir@ && $(SHELL) ./config.status $(SUBDIR)/Makefile
+
 
 boundary_operation_suite_TESTS := test_boundary_operation.pf
 boundary_operation_suite_OTHER_LIBRARIES = -L@top_builddir@/src/.libs -lneko @LDFLAGS@ @LIBS@
diff --git a/tests/unit/case_file_utils/Makefile.in b/tests/unit/case_file_utils/Makefile.in
index dc8750f0e6aa..a361a30be0c0 100644
--- a/tests/unit/case_file_utils/Makefile.in
+++ b/tests/unit/case_file_utils/Makefile.in
@@ -4,12 +4,22 @@ endif
 FFLAGS += $(PFUNIT_EXTRA_FFLAGS) @NEKO_PKG_FCFLAGS@ -I@top_builddir@/src
 FC = @FC@
 
-%.o : %.F90
+# Depend on the library so the test objects follow any change to Neko.
+NEKO_LIB := $(wildcard @top_builddir@/src/libneko.la)
+
+%.o : %.F90 $(NEKO_LIB)
 	$(FC) -c $(FFLAGS) $<
 
 
 check: case_file_utils_test
 
+# Regenerate this Makefile from Makefile.in via config.status
+# whenever it changes.
+SUBDIR := $(patsubst $(abspath @top_builddir@)/%,%,$(CURDIR))
+
+Makefile: Makefile.in @top_builddir@/config.status
+	cd @top_builddir@ && $(SHELL) ./config.status $(SUBDIR)/Makefile
+
 case_file_utils_test_TESTS := test_case_file_utils.pf
 case_file_utils_test_OTHER_LIBRARIES = -L@top_builddir@/src/.libs -lneko @LDFLAGS@ @LIBS@
 $(eval $(call make_pfunit_test,case_file_utils_test))
diff --git a/tests/unit/crystal_router/Makefile.in b/tests/unit/crystal_router/Makefile.in
index 7a5955acbdec..c86a0ed1820d 100644
--- a/tests/unit/crystal_router/Makefile.in
+++ b/tests/unit/crystal_router/Makefile.in
@@ -5,12 +5,22 @@ endif
 FFLAGS += $(PFUNIT_EXTRA_FFLAGS) @NEKO_PKG_FCFLAGS@ -I@top_builddir@/src
 FC = @FC@
 
-%.o : %.F90
+# Depend on the library so the test objects follow any change to Neko.
+NEKO_LIB := $(wildcard @top_builddir@/src/libneko.la)
+
+%.o : %.F90 $(NEKO_LIB)
 	$(FC) -c $(FFLAGS) $<
 
 
 check: crystal_router_test
 
+# Regenerate this Makefile from Makefile.in via config.status
+# whenever it changes.
+SUBDIR := $(patsubst $(abspath @top_builddir@)/%,%,$(CURDIR))
+
+Makefile: Makefile.in @top_builddir@/config.status
+	cd @top_builddir@ && $(SHELL) ./config.status $(SUBDIR)/Makefile
+
 
 crystal_router_test_TESTS := test_crystal_router_parallel.pf
 crystal_router_test_OTHER_LIBRARIES = -L@top_builddir@/src/.libs -lneko @LDFLAGS@ @LIBS@
diff --git a/tests/unit/data_types/Makefile.in b/tests/unit/data_types/Makefile.in
index 383bd6ac6b8b..d406b9a8b9ad 100644
--- a/tests/unit/data_types/Makefile.in
+++ b/tests/unit/data_types/Makefile.in
@@ -4,12 +4,22 @@ endif
 FFLAGS += $(PFUNIT_EXTRA_FFLAGS) @NEKO_PKG_FCFLAGS@ -I@top_builddir@/src
 FC = @FC@
 
-%.o : %.F90
+# Depend on the library so the test objects follow any change to Neko.
+NEKO_LIB := $(wildcard @top_builddir@/src/libneko.la)
+
+%.o : %.F90 $(NEKO_LIB)
 	$(FC) -c $(FFLAGS) $<
 
 
 check: data_types_test
 
+# Regenerate this Makefile from Makefile.in via config.status
+# whenever it changes.
+SUBDIR := $(patsubst $(abspath @top_builddir@)/%,%,$(CURDIR))
+
+Makefile: Makefile.in @top_builddir@/config.status
+	cd @top_builddir@ && $(SHELL) ./config.status $(SUBDIR)/Makefile
+
 
 data_types_test_TESTS := test_host_array_types.pf \
 	test_device_array_types.pf
diff --git a/tests/unit/device/Makefile.in b/tests/unit/device/Makefile.in
index b77db9bd5d1c..975cc5dfc042 100644
--- a/tests/unit/device/Makefile.in
+++ b/tests/unit/device/Makefile.in
@@ -4,12 +4,22 @@ endif
 FFLAGS += $(PFUNIT_EXTRA_FFLAGS) @NEKO_PKG_FCFLAGS@ -I@top_builddir@/src
 FC = @FC@
 
-%.o : %.F90
+# Depend on the library so the test objects follow any change to Neko.
+NEKO_LIB := $(wildcard @top_builddir@/src/libneko.la)
+
+%.o : %.F90 $(NEKO_LIB)
 	$(FC) -c $(FFLAGS) $<
 
 
 check: device_test
 
+# Regenerate this Makefile from Makefile.in via config.status
+# whenever it changes.
+SUBDIR := $(patsubst $(abspath @top_builddir@)/%,%,$(CURDIR))
+
+Makefile: Makefile.in @top_builddir@/config.status
+	cd @top_builddir@ && $(SHELL) ./config.status $(SUBDIR)/Makefile
+
 
 device_test_TESTS := test_device.pf
 device_test_OTHER_LIBRARIES = -L@top_builddir@/src/.libs -lneko @LDFLAGS@ @LIBS@
diff --git a/tests/unit/device_math/Makefile.in b/tests/unit/device_math/Makefile.in
index b66309b7d678..65eb6cebd024 100644
--- a/tests/unit/device_math/Makefile.in
+++ b/tests/unit/device_math/Makefile.in
@@ -5,12 +5,22 @@ endif
 FFLAGS += $(PFUNIT_EXTRA_FFLAGS) @NEKO_PKG_FCFLAGS@ -I@top_builddir@/src
 FC = @FC@
 
-%.o : %.F90
+# Depend on the library so the test objects follow any change to Neko.
+NEKO_LIB := $(wildcard @top_builddir@/src/libneko.la)
+
+%.o : %.F90 $(NEKO_LIB)
 	$(FC) -c $(FFLAGS) $<
 
 
 check: device_math_suite
 
+# Regenerate this Makefile from Makefile.in via config.status
+# whenever it changes.
+SUBDIR := $(patsubst $(abspath @top_builddir@)/%,%,$(CURDIR))
+
+Makefile: Makefile.in @top_builddir@/config.status
+	cd @top_builddir@ && $(SHELL) ./config.status $(SUBDIR)/Makefile
+
 
 device_math_suite_TESTS := test_device_math_parallel.pf
 device_math_suite_OTHER_LIBRARIES = -L@top_builddir@/src/.libs/ -lneko @LDFLAGS@ @LIBS@
diff --git a/tests/unit/device_mathops/Makefile.in b/tests/unit/device_mathops/Makefile.in
index 12449f45028f..850cedf78e94 100644
--- a/tests/unit/device_mathops/Makefile.in
+++ b/tests/unit/device_mathops/Makefile.in
@@ -4,12 +4,22 @@ endif
 FFLAGS += $(PFUNIT_EXTRA_FFLAGS) @NEKO_PKG_FCFLAGS@ -I@top_builddir@/src
 FC = @FC@
 
-%.o : %.F90
+# Depend on the library so the test objects follow any change to Neko.
+NEKO_LIB := $(wildcard @top_builddir@/src/libneko.la)
+
+%.o : %.F90 $(NEKO_LIB)
 	$(FC) -c $(FFLAGS) $<
 
 
 check: device_mathops_test
 
+# Regenerate this Makefile from Makefile.in via config.status
+# whenever it changes.
+SUBDIR := $(patsubst $(abspath @top_builddir@)/%,%,$(CURDIR))
+
+Makefile: Makefile.in @top_builddir@/config.status
+	cd @top_builddir@ && $(SHELL) ./config.status $(SUBDIR)/Makefile
+
 
 device_mathops_test_TESTS := test_device_mathops.pf
 device_mathops_test_OTHER_LIBRARIES = -L@top_builddir@/src/.libs -lneko @LDFLAGS@ @LIBS@
diff --git a/tests/unit/dofmap/Makefile.in b/tests/unit/dofmap/Makefile.in
index c4e2be9ff04c..6ba9f2051d05 100644
--- a/tests/unit/dofmap/Makefile.in
+++ b/tests/unit/dofmap/Makefile.in
@@ -5,12 +5,22 @@ endif
 FFLAGS += $(PFUNIT_EXTRA_FFLAGS) @NEKO_PKG_FCFLAGS@ -I@top_builddir@/src
 FC = @FC@
 
-%.o : %.F90
+# Depend on the library so the test objects follow any change to Neko.
+NEKO_LIB := $(wildcard @top_builddir@/src/libneko.la)
+
+%.o : %.F90 $(NEKO_LIB)
 	$(FC) -c $(FFLAGS) $<
 
 
 check: dofmap_suite
 
+# Regenerate this Makefile from Makefile.in via config.status
+# whenever it changes.
+SUBDIR := $(patsubst $(abspath @top_builddir@)/%,%,$(CURDIR))
+
+Makefile: Makefile.in @top_builddir@/config.status
+	cd @top_builddir@ && $(SHELL) ./config.status $(SUBDIR)/Makefile
+
 
 dofmap_suite_TESTS := test_dofmap_parallel.pf
 dofmap_suite_OTHER_LIBRARIES = -L@top_builddir@/src/.libs -lneko @LDFLAGS@ @LIBS@
diff --git a/tests/unit/expression/Makefile.in b/tests/unit/expression/Makefile.in
index 58433c9b10b1..3d21c9da13f0 100644
--- a/tests/unit/expression/Makefile.in
+++ b/tests/unit/expression/Makefile.in
@@ -4,12 +4,22 @@ endif
 FFLAGS += $(PFUNIT_EXTRA_FFLAGS) @NEKO_PKG_FCFLAGS@ -I@top_builddir@/src
 FC = @FC@
 
-%.o : %.F90
+# Depend on the library so the test objects follow any change to Neko.
+NEKO_LIB := $(wildcard @top_builddir@/src/libneko.la)
+
+%.o : %.F90 $(NEKO_LIB)
 	$(FC) -c $(FFLAGS) $<
 
 
 check: expression_test
 
+# Regenerate this Makefile from Makefile.in via config.status
+# whenever it changes.
+SUBDIR := $(patsubst $(abspath @top_builddir@)/%,%,$(CURDIR))
+
+Makefile: Makefile.in @top_builddir@/config.status
+	cd @top_builddir@ && $(SHELL) ./config.status $(SUBDIR)/Makefile
+
 expression_test_TESTS := test_expression.pf
 expression_test_OTHER_LIBRARIES = -L@top_builddir@/src/.libs -lneko @LDFLAGS@ @LIBS@
 $(eval $(call make_pfunit_test,expression_test))
diff --git a/tests/unit/fast3d/Makefile.in b/tests/unit/fast3d/Makefile.in
index 1d88ffb594c8..d6a5900e662d 100644
--- a/tests/unit/fast3d/Makefile.in
+++ b/tests/unit/fast3d/Makefile.in
@@ -4,12 +4,22 @@ endif
 FFLAGS += $(PFUNIT_EXTRA_FFLAGS) @NEKO_PKG_FCFLAGS@ -I@top_builddir@/src
 FC = @FC@
 
-%.o : %.F90
+# Depend on the library so the test objects follow any change to Neko.
+NEKO_LIB := $(wildcard @top_builddir@/src/libneko.la)
+
+%.o : %.F90 $(NEKO_LIB)
 	$(FC) -c $(FFLAGS) $<
 
 
 check: fast3d_test
 
+# Regenerate this Makefile from Makefile.in via config.status
+# whenever it changes.
+SUBDIR := $(patsubst $(abspath @top_builddir@)/%,%,$(CURDIR))
+
+Makefile: Makefile.in @top_builddir@/config.status
+	cd @top_builddir@ && $(SHELL) ./config.status $(SUBDIR)/Makefile
+
 fast3d_test_TESTS := test_fd_weights_full.pf\
 		     test_setup_intp.pf
 fast3d_test_OTHER_LIBRARIES = -L@top_builddir@/src/.libs -lneko @LDFLAGS@ @LIBS@
diff --git a/tests/unit/field/Makefile.in b/tests/unit/field/Makefile.in
index 307cd08a6075..a5d4c02db21a 100644
--- a/tests/unit/field/Makefile.in
+++ b/tests/unit/field/Makefile.in
@@ -5,12 +5,22 @@ endif
 FFLAGS += $(PFUNIT_EXTRA_FFLAGS) @NEKO_PKG_FCFLAGS@ -I@top_builddir@/src
 FC = @FC@
 
-%.o : %.F90
+# Depend on the library so the test objects follow any change to Neko.
+NEKO_LIB := $(wildcard @top_builddir@/src/libneko.la)
+
+%.o : %.F90 $(NEKO_LIB)
 	$(FC) -c $(FFLAGS) $<
 
 
 check: field_suite
 
+# Regenerate this Makefile from Makefile.in via config.status
+# whenever it changes.
+SUBDIR := $(patsubst $(abspath @top_builddir@)/%,%,$(CURDIR))
+
+Makefile: Makefile.in @top_builddir@/config.status
+	cd @top_builddir@ && $(SHELL) ./config.status $(SUBDIR)/Makefile
+
 
 field_suite_TESTS := test_field_parallel.pf
 field_suite_OTHER_LIBRARIES = -L@top_builddir@/src/.libs -lneko @LDFLAGS@ @LIBS@
diff --git a/tests/unit/gather_scatter/Makefile.in b/tests/unit/gather_scatter/Makefile.in
index 820f1e76030f..8f8b484d4d90 100644
--- a/tests/unit/gather_scatter/Makefile.in
+++ b/tests/unit/gather_scatter/Makefile.in
@@ -5,12 +5,22 @@ endif
 FFLAGS += $(PFUNIT_EXTRA_FFLAGS) @NEKO_PKG_FCFLAGS@ -I@top_builddir@/src
 FC = @FC@
 
-%.o : %.F90
+# Depend on the library so the test objects follow any change to Neko.
+NEKO_LIB := $(wildcard @top_builddir@/src/libneko.la)
+
+%.o : %.F90 $(NEKO_LIB)
 	$(FC) -c $(FFLAGS) $<
 
 
 check: gather_scatter_suite
 
+# Regenerate this Makefile from Makefile.in via config.status
+# whenever it changes.
+SUBDIR := $(patsubst $(abspath @top_builddir@)/%,%,$(CURDIR))
+
+Makefile: Makefile.in @top_builddir@/config.status
+	cd @top_builddir@ && $(SHELL) ./config.status $(SUBDIR)/Makefile
+
 
 gather_scatter_suite_TESTS := test_gather_scatter_parallel.pf
 gather_scatter_suite_OTHER_LIBRARIES = -L@top_builddir@/src/.libs -lneko @LDFLAGS@ @LIBS@
diff --git a/tests/unit/global_interpolation/Makefile.in b/tests/unit/global_interpolation/Makefile.in
index e12c7d949188..2d1fbe06a505 100644
--- a/tests/unit/global_interpolation/Makefile.in
+++ b/tests/unit/global_interpolation/Makefile.in
@@ -5,15 +5,25 @@ endif
 FFLAGS += $(PFUNIT_EXTRA_FFLAGS) @NEKO_PKG_FCFLAGS@ -I@top_builddir@/src
 FC = @FC@
 
-%.o : %.F90
+# Depend on the library so the test objects follow any change to Neko.
+NEKO_LIB := $(wildcard @top_builddir@/src/libneko.la)
+
+%.o : %.F90 $(NEKO_LIB)
 	$(FC) -c $(FFLAGS) $<
 
 
 check: global_interpolation_suite
 
+# Regenerate this Makefile from Makefile.in via config.status
+# whenever it changes.
+SUBDIR := $(patsubst $(abspath @top_builddir@)/%,%,$(CURDIR))
+
+Makefile: Makefile.in @top_builddir@/config.status
+	cd @top_builddir@ && $(SHELL) ./config.status $(SUBDIR)/Makefile
+
 
 global_interpolation_suite_TESTS := test_glob_interp_par.pf
-global_interpolation_suite_OTHER_LIBRARIES = -L@top_builddir@/src/.libs -lneko @LDFLAGS@ @LIBS@ 
+global_interpolation_suite_OTHER_LIBRARIES = -L@top_builddir@/src/.libs -lneko @LDFLAGS@ @LIBS@
 $(eval $(call make_pfunit_test,global_interpolation_suite))
 global_interpolation_suite.inc: Makefile
 
diff --git a/tests/unit/hex/Makefile.in b/tests/unit/hex/Makefile.in
index 99ea87c40d98..b215bb00a86a 100644
--- a/tests/unit/hex/Makefile.in
+++ b/tests/unit/hex/Makefile.in
@@ -4,12 +4,22 @@ endif
 FFLAGS += $(PFUNIT_EXTRA_FFLAGS) @NEKO_PKG_FCFLAGS@ -I@top_builddir@/src
 FC = @FC@
 
-%.o : %.F90
+# Depend on the library so the test objects follow any change to Neko.
+NEKO_LIB := $(wildcard @top_builddir@/src/libneko.la)
+
+%.o : %.F90 $(NEKO_LIB)
 	$(FC) -c $(FFLAGS) $<
 
 
 check: hex_test
 
+# Regenerate this Makefile from Makefile.in via config.status
+# whenever it changes.
+SUBDIR := $(patsubst $(abspath @top_builddir@)/%,%,$(CURDIR))
+
+Makefile: Makefile.in @top_builddir@/config.status
+	cd @top_builddir@ && $(SHELL) ./config.status $(SUBDIR)/Makefile
+
 
 hex_test_TESTS := test_hex.pf
 hex_test_OTHER_LIBRARIES = -L@top_builddir@/src/.libs/ -lneko @LDFLAGS@ @LIBS@
diff --git a/tests/unit/htable/Makefile.in b/tests/unit/htable/Makefile.in
index 52a7bf243467..0f5e8ad3b9e7 100644
--- a/tests/unit/htable/Makefile.in
+++ b/tests/unit/htable/Makefile.in
@@ -4,12 +4,22 @@ endif
 FFLAGS += $(PFUNIT_EXTRA_FFLAGS) @NEKO_PKG_FCFLAGS@ -I@top_builddir@/src
 FC = @FC@
 
-%.o : %.F90
+# Depend on the library so the test objects follow any change to Neko.
+NEKO_LIB := $(wildcard @top_builddir@/src/libneko.la)
+
+%.o : %.F90 $(NEKO_LIB)
 	$(FC) -c $(FFLAGS) $<
 
 
 check: htable_test
 
+# Regenerate this Makefile from Makefile.in via config.status
+# whenever it changes.
+SUBDIR := $(patsubst $(abspath @top_builddir@)/%,%,$(CURDIR))
+
+Makefile: Makefile.in @top_builddir@/config.status
+	cd @top_builddir@ && $(SHELL) ./config.status $(SUBDIR)/Makefile
+
 
 htable_test_TESTS := test_htable_i4.pf\
 		     test_htable_i8.pf\
diff --git a/tests/unit/jobctrl/Makefile.in b/tests/unit/jobctrl/Makefile.in
index f262e7bd3c46..5cafe0501c34 100644
--- a/tests/unit/jobctrl/Makefile.in
+++ b/tests/unit/jobctrl/Makefile.in
@@ -5,12 +5,22 @@ endif
 FFLAGS += $(PFUNIT_EXTRA_FFLAGS) @NEKO_PKG_FCFLAGS@ -I@top_builddir@/src
 FC = @FC@
 
-%.o : %.F90
+# Depend on the library so the test objects follow any change to Neko.
+NEKO_LIB := $(wildcard @top_builddir@/src/libneko.la)
+
+%.o : %.F90 $(NEKO_LIB)
 	$(FC) -c $(FFLAGS) $<
 
 
 check: jobctrl_suite
 
+# Regenerate this Makefile from Makefile.in via config.status
+# whenever it changes.
+SUBDIR := $(patsubst $(abspath @top_builddir@)/%,%,$(CURDIR))
+
+Makefile: Makefile.in @top_builddir@/config.status
+	cd @top_builddir@ && $(SHELL) ./config.status $(SUBDIR)/Makefile
+
 
 jobctrl_suite_TESTS := test_jobctrl_parallel.pf
 jobctrl_suite_OTHER_LIBRARIES = -L@top_builddir@/src/.libs -lneko @LDFLAGS@ @LIBS@
diff --git a/tests/unit/json_utils/Makefile.in b/tests/unit/json_utils/Makefile.in
index e5dbdf8aa1ab..e57d314839b6 100644
--- a/tests/unit/json_utils/Makefile.in
+++ b/tests/unit/json_utils/Makefile.in
@@ -4,12 +4,22 @@ endif
 FFLAGS += $(PFUNIT_EXTRA_FFLAGS) @NEKO_PKG_FCFLAGS@ -I@top_builddir@/src
 FC = @FC@
 
-%.o : %.F90
+# Depend on the library so the test objects follow any change to Neko.
+NEKO_LIB := $(wildcard @top_builddir@/src/libneko.la)
+
+%.o : %.F90 $(NEKO_LIB)
 	$(FC) -c $(FFLAGS) $<
 
 
 check: json_utils_test
 
+# Regenerate this Makefile from Makefile.in via config.status
+# whenever it changes.
+SUBDIR := $(patsubst $(abspath @top_builddir@)/%,%,$(CURDIR))
+
+Makefile: Makefile.in @top_builddir@/config.status
+	cd @top_builddir@ && $(SHELL) ./config.status $(SUBDIR)/Makefile
+
 
 json_utils_test_TESTS := test_json_utils.pf
 json_utils_test_OTHER_LIBRARIES = -L@top_builddir@/src/.libs -lneko @LDFLAGS@ @LIBS@
diff --git a/tests/unit/krylov/Makefile.in b/tests/unit/krylov/Makefile.in
index b797a0f41aa8..6f3c85224908 100644
--- a/tests/unit/krylov/Makefile.in
+++ b/tests/unit/krylov/Makefile.in
@@ -4,12 +4,22 @@ endif
 FFLAGS += $(PFUNIT_EXTRA_FFLAGS) @NEKO_PKG_FCFLAGS@ -I@top_builddir@/src
 FC = @FC@
 
-%.o : %.F90
+# Depend on the library so the test objects follow any change to Neko.
+NEKO_LIB := $(wildcard @top_builddir@/src/libneko.la)
+
+%.o : %.F90 $(NEKO_LIB)
 	$(FC) -c $(FFLAGS) $<
 
 
 check: krylov_test
 
+# Regenerate this Makefile from Makefile.in via config.status
+# whenever it changes.
+SUBDIR := $(patsubst $(abspath @top_builddir@)/%,%,$(CURDIR))
+
+Makefile: Makefile.in @top_builddir@/config.status
+	cd @top_builddir@ && $(SHELL) ./config.status $(SUBDIR)/Makefile
+
 
 krylov_test_TESTS := test_krylov.pf
 krylov_test_OTHER_LIBRARIES = -L@top_builddir@/src/.libs -lneko @LDFLAGS@ @LIBS@
diff --git a/tests/unit/math/Makefile.in b/tests/unit/math/Makefile.in
index 61b7fdeb81c7..e8dc5693a1aa 100644
--- a/tests/unit/math/Makefile.in
+++ b/tests/unit/math/Makefile.in
@@ -5,12 +5,22 @@ endif
 FFLAGS += $(PFUNIT_EXTRA_FFLAGS) @NEKO_PKG_FCFLAGS@ -I@top_builddir@/src
 FC = @FC@
 
-%.o : %.F90
+# Depend on the library so the test objects follow any change to Neko.
+NEKO_LIB := $(wildcard @top_builddir@/src/libneko.la)
+
+%.o : %.F90 $(NEKO_LIB)
 	$(FC) -c $(FFLAGS) $<
 
 
 check: math_suite
 
+# Regenerate this Makefile from Makefile.in via config.status
+# whenever it changes.
+SUBDIR := $(patsubst $(abspath @top_builddir@)/%,%,$(CURDIR))
+
+Makefile: Makefile.in @top_builddir@/config.status
+	cd @top_builddir@ && $(SHELL) ./config.status $(SUBDIR)/Makefile
+
 
 math_suite_TESTS := test_math_parallel.pf
 math_suite_OTHER_LIBRARIES = -L@top_builddir@/src/.libs -lneko @LDFLAGS@ @LIBS@
diff --git a/tests/unit/mathops/Makefile.in b/tests/unit/mathops/Makefile.in
index d398eda7b224..874f81f7c3e0 100644
--- a/tests/unit/mathops/Makefile.in
+++ b/tests/unit/mathops/Makefile.in
@@ -4,12 +4,22 @@ endif
 FFLAGS += $(PFUNIT_EXTRA_FFLAGS) @NEKO_PKG_FCFLAGS@ -I@top_builddir@/src
 FC = @FC@
 
-%.o : %.F90
+# Depend on the library so the test objects follow any change to Neko.
+NEKO_LIB := $(wildcard @top_builddir@/src/libneko.la)
+
+%.o : %.F90 $(NEKO_LIB)
 	$(FC) -c $(FFLAGS) $<
 
 
 check: mathops_test
 
+# Regenerate this Makefile from Makefile.in via config.status
+# whenever it changes.
+SUBDIR := $(patsubst $(abspath @top_builddir@)/%,%,$(CURDIR))
+
+Makefile: Makefile.in @top_builddir@/config.status
+	cd @top_builddir@ && $(SHELL) ./config.status $(SUBDIR)/Makefile
+
 
 mathops_test_TESTS := test_mathops.pf
 mathops_test_OTHER_LIBRARIES = -L@top_builddir@/src/.libs -lneko @LDFLAGS@ @LIBS@
diff --git a/tests/unit/matrix/Makefile.in b/tests/unit/matrix/Makefile.in
index a8720e1ce332..b49861ad3ffe 100644
--- a/tests/unit/matrix/Makefile.in
+++ b/tests/unit/matrix/Makefile.in
@@ -5,12 +5,22 @@ endif
 FFLAGS += $(PFUNIT_EXTRA_FFLAGS) @NEKO_PKG_FCFLAGS@ -I@top_builddir@/src
 FC = @FC@
 
-%.o : %.F90
+# Depend on the library so the test objects follow any change to Neko.
+NEKO_LIB := $(wildcard @top_builddir@/src/libneko.la)
+
+%.o : %.F90 $(NEKO_LIB)
 	$(FC) -c $(FFLAGS) $<
 
 
 check: matrix_suite
 
+# Regenerate this Makefile from Makefile.in via config.status
+# whenever it changes.
+SUBDIR := $(patsubst $(abspath @top_builddir@)/%,%,$(CURDIR))
+
+Makefile: Makefile.in @top_builddir@/config.status
+	cd @top_builddir@ && $(SHELL) ./config.status $(SUBDIR)/Makefile
+
 
 matrix_suite_TESTS := test_matrix_parallel.pf
 matrix_suite_OTHER_LIBRARIES = -L@top_builddir@/src/.libs -lneko @LDFLAGS@ @LIBS@
diff --git a/tests/unit/mean_field/Makefile.in b/tests/unit/mean_field/Makefile.in
index 7b2833c45593..cb56b6043aae 100644
--- a/tests/unit/mean_field/Makefile.in
+++ b/tests/unit/mean_field/Makefile.in
@@ -5,12 +5,22 @@ endif
 FFLAGS += $(PFUNIT_EXTRA_FFLAGS) @NEKO_PKG_FCFLAGS@ -I@top_builddir@/src
 FC = @FC@
 
-%.o : %.F90
+# Depend on the library so the test objects follow any change to Neko.
+NEKO_LIB := $(wildcard @top_builddir@/src/libneko.la)
+
+%.o : %.F90 $(NEKO_LIB)
 	$(FC) -c $(FFLAGS) $<
 
 
 check: mean_field_suite
 
+# Regenerate this Makefile from Makefile.in via config.status
+# whenever it changes.
+SUBDIR := $(patsubst $(abspath @top_builddir@)/%,%,$(CURDIR))
+
+Makefile: Makefile.in @top_builddir@/config.status
+	cd @top_builddir@ && $(SHELL) ./config.status $(SUBDIR)/Makefile
+
 
 mean_field_suite_TESTS := test_mean_field_parallel.pf
 mean_field_suite_OTHER_LIBRARIES = -L@top_builddir@/src/.libs -lneko @LDFLAGS@ @LIBS@
diff --git a/tests/unit/mesh/Makefile.in b/tests/unit/mesh/Makefile.in
index d10c4b3cc74f..41bc00da262d 100644
--- a/tests/unit/mesh/Makefile.in
+++ b/tests/unit/mesh/Makefile.in
@@ -5,12 +5,22 @@ endif
 FFLAGS += $(PFUNIT_EXTRA_FFLAGS) @NEKO_PKG_FCFLAGS@ -I@top_builddir@/src
 FC = @FC@
 
-%.o : %.F90
+# Depend on the library so the test objects follow any change to Neko.
+NEKO_LIB := $(wildcard @top_builddir@/src/libneko.la)
+
+%.o : %.F90 $(NEKO_LIB)
 	$(FC) -c $(FFLAGS) $<
 
 
 check: mesh_suite
 
+# Regenerate this Makefile from Makefile.in via config.status
+# whenever it changes.
+SUBDIR := $(patsubst $(abspath @top_builddir@)/%,%,$(CURDIR))
+
+Makefile: Makefile.in @top_builddir@/config.status
+	cd @top_builddir@ && $(SHELL) ./config.status $(SUBDIR)/Makefile
+
 
 mesh_suite_TESTS := test_mesh_parallel.pf
 mesh_suite_OTHER_LIBRARIES = -L@top_builddir@/src/.libs -lneko @LDFLAGS@ @LIBS@
diff --git a/tests/unit/octree/Makefile.in b/tests/unit/octree/Makefile.in
index 37ec65e0e17a..0a30e5ecb6ad 100644
--- a/tests/unit/octree/Makefile.in
+++ b/tests/unit/octree/Makefile.in
@@ -4,12 +4,22 @@ endif
 FFLAGS += $(PFUNIT_EXTRA_FFLAGS) @NEKO_PKG_FCFLAGS@ -I@top_builddir@/src
 FC = @FC@
 
-%.o : %.F90
+# Depend on the library so the test objects follow any change to Neko.
+NEKO_LIB := $(wildcard @top_builddir@/src/libneko.la)
+
+%.o : %.F90 $(NEKO_LIB)
 	$(FC) -c $(FFLAGS) $<
 
 
 check: octree_test
 
+# Regenerate this Makefile from Makefile.in via config.status
+# whenever it changes.
+SUBDIR := $(patsubst $(abspath @top_builddir@)/%,%,$(CURDIR))
+
+Makefile: Makefile.in @top_builddir@/config.status
+	cd @top_builddir@ && $(SHELL) ./config.status $(SUBDIR)/Makefile
+
 
 octree_test_TESTS := test_octree.pf
 octree_test_OTHER_LIBRARIES = -L@top_builddir@/src/.libs -lneko @LDFLAGS@ @LIBS@
diff --git a/tests/unit/point/Makefile.in b/tests/unit/point/Makefile.in
index 0fc601bff14c..0d974caf0517 100644
--- a/tests/unit/point/Makefile.in
+++ b/tests/unit/point/Makefile.in
@@ -4,12 +4,22 @@ endif
 FFLAGS += $(PFUNIT_EXTRA_FFLAGS) @NEKO_PKG_FCFLAGS@ -I@top_builddir@/src
 FC = @FC@
 
-%.o : %.F90
+# Depend on the library so the test objects follow any change to Neko.
+NEKO_LIB := $(wildcard @top_builddir@/src/libneko.la)
+
+%.o : %.F90 $(NEKO_LIB)
 	$(FC) -c $(FFLAGS) $<
 
 
 check: point_test
 
+# Regenerate this Makefile from Makefile.in via config.status
+# whenever it changes.
+SUBDIR := $(patsubst $(abspath @top_builddir@)/%,%,$(CURDIR))
+
+Makefile: Makefile.in @top_builddir@/config.status
+	cd @top_builddir@ && $(SHELL) ./config.status $(SUBDIR)/Makefile
+
 
 point_test_TESTS := test_point.pf
 point_test_OTHER_LIBRARIES = -L@top_builddir@/src/.libs/ -lneko @LDFLAGS@ @LIBS@
diff --git a/tests/unit/point_interpolation/Makefile.in b/tests/unit/point_interpolation/Makefile.in
index 0ba5f3d9cf55..34a66162ca87 100644
--- a/tests/unit/point_interpolation/Makefile.in
+++ b/tests/unit/point_interpolation/Makefile.in
@@ -5,12 +5,22 @@ endif
 FFLAGS += $(PFUNIT_EXTRA_FFLAGS) @NEKO_PKG_FCFLAGS@ -I@top_builddir@/src
 FC = @FC@
 
-%.o : %.F90
+# Depend on the library so the test objects follow any change to Neko.
+NEKO_LIB := $(wildcard @top_builddir@/src/libneko.la)
+
+%.o : %.F90 $(NEKO_LIB)
 	$(FC) -c $(FFLAGS) $<
 
 
 check: point_interpolation_suite
 
+# Regenerate this Makefile from Makefile.in via config.status
+# whenever it changes.
+SUBDIR := $(patsubst $(abspath @top_builddir@)/%,%,$(CURDIR))
+
+Makefile: Makefile.in @top_builddir@/config.status
+	cd @top_builddir@ && $(SHELL) ./config.status $(SUBDIR)/Makefile
+
 
 point_interpolation_suite_TESTS := test_point_interpolation_parallel.pf
 point_interpolation_suite_OTHER_LIBRARIES = -L@top_builddir@/src/.libs -lneko @LDFLAGS@ @LIBS@
diff --git a/tests/unit/quad/Makefile.in b/tests/unit/quad/Makefile.in
index 01f3760a20b1..bc455f00c3ad 100644
--- a/tests/unit/quad/Makefile.in
+++ b/tests/unit/quad/Makefile.in
@@ -4,12 +4,22 @@ endif
 FFLAGS += $(PFUNIT_EXTRA_FFLAGS) @NEKO_PKG_FCFLAGS@ -I@top_builddir@/src
 FC = @FC@
 
-%.o : %.F90
+# Depend on the library so the test objects follow any change to Neko.
+NEKO_LIB := $(wildcard @top_builddir@/src/libneko.la)
+
+%.o : %.F90 $(NEKO_LIB)
 	$(FC) -c $(FFLAGS) $<
 
 
 check: quad_test
 
+# Regenerate this Makefile from Makefile.in via config.status
+# whenever it changes.
+SUBDIR := $(patsubst $(abspath @top_builddir@)/%,%,$(CURDIR))
+
+Makefile: Makefile.in @top_builddir@/config.status
+	cd @top_builddir@ && $(SHELL) ./config.status $(SUBDIR)/Makefile
+
 
 quad_test_TESTS := test_quad.pf
 quad_test_OTHER_LIBRARIES = -L@top_builddir@/src/.libs -lneko @LDFLAGS@ @LIBS@
diff --git a/tests/unit/registry/Makefile.in b/tests/unit/registry/Makefile.in
index 092a590904b4..33f22c3e1e9f 100644
--- a/tests/unit/registry/Makefile.in
+++ b/tests/unit/registry/Makefile.in
@@ -5,12 +5,22 @@ endif
 FFLAGS += $(PFUNIT_EXTRA_FFLAGS) @NEKO_PKG_FCFLAGS@ -I@top_builddir@/src
 FC = @FC@
 
-%.o : %.F90
+# Depend on the library so the test objects follow any change to Neko.
+NEKO_LIB := $(wildcard @top_builddir@/src/libneko.la)
+
+%.o : %.F90 $(NEKO_LIB)
 	$(FC) -c $(FFLAGS) $<
 
 
 check: registry_test
 
+# Regenerate this Makefile from Makefile.in via config.status
+# whenever it changes.
+SUBDIR := $(patsubst $(abspath @top_builddir@)/%,%,$(CURDIR))
+
+Makefile: Makefile.in @top_builddir@/config.status
+	cd @top_builddir@ && $(SHELL) ./config.status $(SUBDIR)/Makefile
+
 registry_test_TESTS := test_field_registry.pf \
 	test_scalar_registry.pf \
 	test_vector_registry.pf \
diff --git a/tests/unit/runge_kutta_scheme/Makefile.in b/tests/unit/runge_kutta_scheme/Makefile.in
index 5e05bfe5e676..7a2bfcdede72 100644
--- a/tests/unit/runge_kutta_scheme/Makefile.in
+++ b/tests/unit/runge_kutta_scheme/Makefile.in
@@ -4,12 +4,22 @@ endif
 FFLAGS += $(PFUNIT_EXTRA_FFLAGS) @NEKO_PKG_FCFLAGS@ -I@top_builddir@/src
 FC = @FC@
 
-%.o : %.F90
+# Depend on the library so the test objects follow any change to Neko.
+NEKO_LIB := $(wildcard @top_builddir@/src/libneko.la)
+
+%.o : %.F90 $(NEKO_LIB)
 	$(FC) -c $(FFLAGS) $<
 
 
 check: runge_kutta_scheme_test
 
+# Regenerate this Makefile from Makefile.in via config.status
+# whenever it changes.
+SUBDIR := $(patsubst $(abspath @top_builddir@)/%,%,$(CURDIR))
+
+Makefile: Makefile.in @top_builddir@/config.status
+	cd @top_builddir@ && $(SHELL) ./config.status $(SUBDIR)/Makefile
+
 runge_kutta_scheme_test_TESTS := test_runge_kutta_scheme.pf
 
 runge_kutta_scheme_test_OTHER_LIBRARIES = -L@top_builddir@/src/.libs -lneko @LDFLAGS@ @LIBS@
diff --git a/tests/unit/scratch_registry/Makefile.in b/tests/unit/scratch_registry/Makefile.in
index 9d0b4381eb17..8145ab066691 100644
--- a/tests/unit/scratch_registry/Makefile.in
+++ b/tests/unit/scratch_registry/Makefile.in
@@ -5,12 +5,22 @@ endif
 FFLAGS += $(PFUNIT_EXTRA_FFLAGS) @NEKO_PKG_FCFLAGS@ -I@top_builddir@/src
 FC = @FC@
 
-%.o : %.F90
+# Depend on the library so the test objects follow any change to Neko.
+NEKO_LIB := $(wildcard @top_builddir@/src/libneko.la)
+
+%.o : %.F90 $(NEKO_LIB)
 	$(FC) -c $(FFLAGS) $<
 
 
 check: scratch_registry_test
 
+# Regenerate this Makefile from Makefile.in via config.status
+# whenever it changes.
+SUBDIR := $(patsubst $(abspath @top_builddir@)/%,%,$(CURDIR))
+
+Makefile: Makefile.in @top_builddir@/config.status
+	cd @top_builddir@ && $(SHELL) ./config.status $(SUBDIR)/Makefile
+
 scratch_registry_test_TESTS := test_field_scratch_registry.pf\
 	test_vector_scratch_registry.pf\
 	test_matrix_scratch_registry.pf\
diff --git a/tests/unit/signal/Makefile.in b/tests/unit/signal/Makefile.in
index 265105654593..c1572eee4f3a 100644
--- a/tests/unit/signal/Makefile.in
+++ b/tests/unit/signal/Makefile.in
@@ -4,12 +4,22 @@ endif
 FFLAGS += $(PFUNIT_EXTRA_FFLAGS) @NEKO_PKG_FCFLAGS@ -I@top_builddir@/src
 FC = @FC@
 
-%.o : %.F90
+# Depend on the library so the test objects follow any change to Neko.
+NEKO_LIB := $(wildcard @top_builddir@/src/libneko.la)
+
+%.o : %.F90 $(NEKO_LIB)
 	$(FC) -c $(FFLAGS) $<
 
 
 check: signal_test
 
+# Regenerate this Makefile from Makefile.in via config.status
+# whenever it changes.
+SUBDIR := $(patsubst $(abspath @top_builddir@)/%,%,$(CURDIR))
+
+Makefile: Makefile.in @top_builddir@/config.status
+	cd @top_builddir@ && $(SHELL) ./config.status $(SUBDIR)/Makefile
+
 
 signal_test_TESTS := test_signal.pf
 signal_test_OTHER_LIBRARIES = -L@top_builddir@/src/.libs -lneko @LDFLAGS@ @LIBS@
diff --git a/tests/unit/space/Makefile.in b/tests/unit/space/Makefile.in
index e5e34b61c829..aff4603489e1 100644
--- a/tests/unit/space/Makefile.in
+++ b/tests/unit/space/Makefile.in
@@ -4,12 +4,22 @@ endif
 FFLAGS += $(PFUNIT_EXTRA_FFLAGS) @NEKO_PKG_FCFLAGS@ -I@top_builddir@/src
 FC = @FC@
 
-%.o : %.F90
+# Depend on the library so the test objects follow any change to Neko.
+NEKO_LIB := $(wildcard @top_builddir@/src/libneko.la)
+
+%.o : %.F90 $(NEKO_LIB)
 	$(FC) -c $(FFLAGS) $<
 
 
 check: space_test
 
+# Regenerate this Makefile from Makefile.in via config.status
+# whenever it changes.
+SUBDIR := $(patsubst $(abspath @top_builddir@)/%,%,$(CURDIR))
+
+Makefile: Makefile.in @top_builddir@/config.status
+	cd @top_builddir@ && $(SHELL) ./config.status $(SUBDIR)/Makefile
+
 
 space_test_TESTS := test_space_test.pf
 space_test_OTHER_LIBRARIES = -L@top_builddir@/src/.libs -lneko @LDFLAGS@ @LIBS@
diff --git a/tests/unit/stack/Makefile.in b/tests/unit/stack/Makefile.in
index f1607373af6d..1ae5e2b22c10 100644
--- a/tests/unit/stack/Makefile.in
+++ b/tests/unit/stack/Makefile.in
@@ -4,12 +4,22 @@ endif
 FFLAGS += $(PFUNIT_EXTRA_FFLAGS) @NEKO_PKG_FCFLAGS@ -I@top_builddir@/src
 FC = @FC@
 
-%.o : %.F90
+# Depend on the library so the test objects follow any change to Neko.
+NEKO_LIB := $(wildcard @top_builddir@/src/libneko.la)
+
+%.o : %.F90 $(NEKO_LIB)
 	$(FC) -c $(FFLAGS) $<
 
 
 check: stack_test
 
+# Regenerate this Makefile from Makefile.in via config.status
+# whenever it changes.
+SUBDIR := $(patsubst $(abspath @top_builddir@)/%,%,$(CURDIR))
+
+Makefile: Makefile.in @top_builddir@/config.status
+	cd @top_builddir@ && $(SHELL) ./config.status $(SUBDIR)/Makefile
+
 
 stack_test_TESTS := test_stack_i4.pf\
 		    test_stack_i8.pf\
diff --git a/tests/unit/templates/parallel/Makefile.in b/tests/unit/templates/parallel/Makefile.in
index 5e112ecbd8c4..d6b382382cc0 100644
--- a/tests/unit/templates/parallel/Makefile.in
+++ b/tests/unit/templates/parallel/Makefile.in
@@ -5,12 +5,22 @@ endif
 FFLAGS += $(PFUNIT_EXTRA_FFLAGS) @NEKO_PKG_FCFLAGS@ -I@top_builddir@/src
 FC = @FC@
 
-%.o : %.F90
+# Depend on the library so the test objects follow any change to Neko.
+NEKO_LIB := $(wildcard @top_builddir@/src/libneko.la)
+
+%.o : %.F90 $(NEKO_LIB)
 	$(FC) -c $(FFLAGS) $<
 
 
 check: parallel_suite
 
+# Regenerate this Makefile from Makefile.in via config.status
+# whenever it changes.
+SUBDIR := $(patsubst $(abspath @top_builddir@)/%,%,$(CURDIR))
+
+Makefile: Makefile.in @top_builddir@/config.status
+	cd @top_builddir@ && $(SHELL) ./config.status $(SUBDIR)/Makefile
+
 
 parallel_suite_TESTS := test_parallel.pf
 parallel_suite_OTHER_LIBRARIES = -L@top_builddir@/src/.libs -lneko @LDFLAGS@ @LIBS@
diff --git a/tests/unit/templates/serial/Makefile.in b/tests/unit/templates/serial/Makefile.in
index d36a57f9829a..c63bd9b68b9f 100644
--- a/tests/unit/templates/serial/Makefile.in
+++ b/tests/unit/templates/serial/Makefile.in
@@ -4,12 +4,22 @@ endif
 FFLAGS += $(PFUNIT_EXTRA_FFLAGS) @NEKO_PKG_FCFLAGS@ -I@top_builddir@/src
 FC = @FC@
 
-%.o : %.F90
+# Depend on the library so the test objects follow any change to Neko.
+NEKO_LIB := $(wildcard @top_builddir@/src/libneko.la)
+
+%.o : %.F90 $(NEKO_LIB)
 	$(FC) -c $(FFLAGS) $<
 
 
 check: serial_test
 
+# Regenerate this Makefile from Makefile.in via config.status
+# whenever it changes.
+SUBDIR := $(patsubst $(abspath @top_builddir@)/%,%,$(CURDIR))
+
+Makefile: Makefile.in @top_builddir@/config.status
+	cd @top_builddir@ && $(SHELL) ./config.status $(SUBDIR)/Makefile
+
 serial_test_TESTS := test_serial.pf
 
 serial_test_OTHER_LIBRARIES = -L@top_builddir@/src/.libs -lneko @LDFLAGS@ @LIBS@
diff --git a/tests/unit/tet/Makefile.in b/tests/unit/tet/Makefile.in
index 12b3ebe4b52b..3852f79e9de8 100644
--- a/tests/unit/tet/Makefile.in
+++ b/tests/unit/tet/Makefile.in
@@ -4,12 +4,22 @@ endif
 FFLAGS += $(PFUNIT_EXTRA_FFLAGS) @NEKO_PKG_FCFLAGS@ -I@top_builddir@/src
 FC = @FC@
 
-%.o : %.F90
+# Depend on the library so the test objects follow any change to Neko.
+NEKO_LIB := $(wildcard @top_builddir@/src/libneko.la)
+
+%.o : %.F90 $(NEKO_LIB)
 	$(FC) -c $(FFLAGS) $<
 
 
 check: tet_test
 
+# Regenerate this Makefile from Makefile.in via config.status
+# whenever it changes.
+SUBDIR := $(patsubst $(abspath @top_builddir@)/%,%,$(CURDIR))
+
+Makefile: Makefile.in @top_builddir@/config.status
+	cd @top_builddir@ && $(SHELL) ./config.status $(SUBDIR)/Makefile
+
 
 tet_test_TESTS := test_tet.pf
 tet_test_OTHER_LIBRARIES = -L@top_builddir@/src/.libs -lneko @LDFLAGS@ @LIBS@
diff --git a/tests/unit/time_based_controller/Makefile.in b/tests/unit/time_based_controller/Makefile.in
index 9f8168427979..6e81c156d297 100644
--- a/tests/unit/time_based_controller/Makefile.in
+++ b/tests/unit/time_based_controller/Makefile.in
@@ -4,12 +4,22 @@ endif
 FFLAGS += $(PFUNIT_EXTRA_FFLAGS) @NEKO_PKG_FCFLAGS@ -I@top_builddir@/src
 FC = @FC@
 
-%.o : %.F90
+# Depend on the library so the test objects follow any change to Neko.
+NEKO_LIB := $(wildcard @top_builddir@/src/libneko.la)
+
+%.o : %.F90 $(NEKO_LIB)
 	$(FC) -c $(FFLAGS) $<
 
 
 check: time_based_controller_test
 
+# Regenerate this Makefile from Makefile.in via config.status
+# whenever it changes.
+SUBDIR := $(patsubst $(abspath @top_builddir@)/%,%,$(CURDIR))
+
+Makefile: Makefile.in @top_builddir@/config.status
+	cd @top_builddir@ && $(SHELL) ./config.status $(SUBDIR)/Makefile
+
 time_based_controller_test_TESTS := test_time_based_controller.pf
 
 time_based_controller_test_OTHER_LIBRARIES = -L@top_builddir@/src/.libs -lneko @LDFLAGS@ @LIBS@
diff --git a/tests/unit/time_scheme/Makefile.in b/tests/unit/time_scheme/Makefile.in
index 1348c0acf76b..a89f9e13a9b3 100644
--- a/tests/unit/time_scheme/Makefile.in
+++ b/tests/unit/time_scheme/Makefile.in
@@ -4,12 +4,22 @@ endif
 FFLAGS += $(PFUNIT_EXTRA_FFLAGS) @NEKO_PKG_FCFLAGS@ -I@top_builddir@/src
 FC = @FC@
 
-%.o : %.F90
+# Depend on the library so the test objects follow any change to Neko.
+NEKO_LIB := $(wildcard @top_builddir@/src/libneko.la)
+
+%.o : %.F90 $(NEKO_LIB)
 	$(FC) -c $(FFLAGS) $<
 
 
 check: time_scheme_test
 
+# Regenerate this Makefile from Makefile.in via config.status
+# whenever it changes.
+SUBDIR := $(patsubst $(abspath @top_builddir@)/%,%,$(CURDIR))
+
+Makefile: Makefile.in @top_builddir@/config.status
+	cd @top_builddir@ && $(SHELL) ./config.status $(SUBDIR)/Makefile
+
 time_scheme_test_TESTS := test_bdf.pf\
     test_ext.pf\
     test_ab.pf
diff --git a/tests/unit/time_scheme_controller/Makefile.in b/tests/unit/time_scheme_controller/Makefile.in
index c74bf0fcb544..01956da52ec1 100644
--- a/tests/unit/time_scheme_controller/Makefile.in
+++ b/tests/unit/time_scheme_controller/Makefile.in
@@ -4,12 +4,22 @@ endif
 FFLAGS += $(PFUNIT_EXTRA_FFLAGS) @NEKO_PKG_FCFLAGS@ -I@top_builddir@/src
 FC = @FC@
 
-%.o : %.F90
+# Depend on the library so the test objects follow any change to Neko.
+NEKO_LIB := $(wildcard @top_builddir@/src/libneko.la)
+
+%.o : %.F90 $(NEKO_LIB)
 	$(FC) -c $(FFLAGS) $<
 
 
 check: time_scheme_controller_test
 
+# Regenerate this Makefile from Makefile.in via config.status
+# whenever it changes.
+SUBDIR := $(patsubst $(abspath @top_builddir@)/%,%,$(CURDIR))
+
+Makefile: Makefile.in @top_builddir@/config.status
+	cd @top_builddir@ && $(SHELL) ./config.status $(SUBDIR)/Makefile
+
 time_scheme_controller_test_TESTS := test_time_scheme_controller.pf
 
 time_scheme_controller_test_OTHER_LIBRARIES = -L@top_builddir@/src/.libs -lneko @LDFLAGS@ @LIBS@
diff --git a/tests/unit/tri/Makefile.in b/tests/unit/tri/Makefile.in
index e334763a44e7..b833589c8a4c 100644
--- a/tests/unit/tri/Makefile.in
+++ b/tests/unit/tri/Makefile.in
@@ -4,12 +4,22 @@ endif
 FFLAGS += $(PFUNIT_EXTRA_FFLAGS) @NEKO_PKG_FCFLAGS@ -I@top_builddir@/src
 FC = @FC@
 
-%.o : %.F90
+# Depend on the library so the test objects follow any change to Neko.
+NEKO_LIB := $(wildcard @top_builddir@/src/libneko.la)
+
+%.o : %.F90 $(NEKO_LIB)
 	$(FC) -c $(FFLAGS) $<
 
 
 check: tri_test
 
+# Regenerate this Makefile from Makefile.in via config.status
+# whenever it changes.
+SUBDIR := $(patsubst $(abspath @top_builddir@)/%,%,$(CURDIR))
+
+Makefile: Makefile.in @top_builddir@/config.status
+	cd @top_builddir@ && $(SHELL) ./config.status $(SUBDIR)/Makefile
+
 
 tri_test_TESTS := test_tri.pf
 tri_test_OTHER_LIBRARIES = -L@top_builddir@/src/.libs -lneko @LDFLAGS@ @LIBS@
diff --git a/tests/unit/tuple/Makefile.in b/tests/unit/tuple/Makefile.in
index 3ac2a290fcfa..ecb2e2f35d01 100644
--- a/tests/unit/tuple/Makefile.in
+++ b/tests/unit/tuple/Makefile.in
@@ -4,12 +4,22 @@ endif
 FFLAGS += $(PFUNIT_EXTRA_FFLAGS) @NEKO_PKG_FCFLAGS@ -I@top_builddir@/src
 FC = @FC@
 
-%.o : %.F90
+# Depend on the library so the test objects follow any change to Neko.
+NEKO_LIB := $(wildcard @top_builddir@/src/libneko.la)
+
+%.o : %.F90 $(NEKO_LIB)
 	$(FC) -c $(FFLAGS) $<
 
 
 check: tuple_test
 
+# Regenerate this Makefile from Makefile.in via config.status
+# whenever it changes.
+SUBDIR := $(patsubst $(abspath @top_builddir@)/%,%,$(CURDIR))
+
+Makefile: Makefile.in @top_builddir@/config.status
+	cd @top_builddir@ && $(SHELL) ./config.status $(SUBDIR)/Makefile
+
 
 tuple_test_TESTS := test_tuple.pf
 tuple_test_OTHER_LIBRARIES = -L@top_builddir@/src/.libs -lneko @LDFLAGS@ @LIBS@
diff --git a/tests/unit/uset/Makefile.in b/tests/unit/uset/Makefile.in
index 3284a1e03906..7c7da59265a1 100644
--- a/tests/unit/uset/Makefile.in
+++ b/tests/unit/uset/Makefile.in
@@ -4,12 +4,22 @@ endif
 FFLAGS += $(PFUNIT_EXTRA_FFLAGS) @NEKO_PKG_FCFLAGS@ -I@top_builddir@/src
 FC = @FC@
 
-%.o : %.F90
+# Depend on the library so the test objects follow any change to Neko.
+NEKO_LIB := $(wildcard @top_builddir@/src/libneko.la)
+
+%.o : %.F90 $(NEKO_LIB)
 	$(FC) -c $(FFLAGS) $<
 
 
 check: uset_test
 
+# Regenerate this Makefile from Makefile.in via config.status
+# whenever it changes.
+SUBDIR := $(patsubst $(abspath @top_builddir@)/%,%,$(CURDIR))
+
+Makefile: Makefile.in @top_builddir@/config.status
+	cd @top_builddir@ && $(SHELL) ./config.status $(SUBDIR)/Makefile
+
 
 uset_test_TESTS := test_uset_i4.pf test_uset_i8.pf test_uset_r8.pf
 uset_test_OTHER_LIBRARIES = -L@top_builddir@/src/.libs/ -lneko @LDFLAGS@ @LIBS@
diff --git a/tests/unit/utils/Makefile.in b/tests/unit/utils/Makefile.in
index 9a624c7caadc..ae82929e6951 100644
--- a/tests/unit/utils/Makefile.in
+++ b/tests/unit/utils/Makefile.in
@@ -4,12 +4,22 @@ endif
 FFLAGS += $(PFUNIT_EXTRA_FFLAGS) @NEKO_PKG_FCFLAGS@ -I@top_builddir@/src
 FC = @FC@
 
-%.o : %.F90
+# Depend on the library so the test objects follow any change to Neko.
+NEKO_LIB := $(wildcard @top_builddir@/src/libneko.la)
+
+%.o : %.F90 $(NEKO_LIB)
 	$(FC) -c $(FFLAGS) $<
 
 
 check: read_duration_test
 
+# Regenerate this Makefile from Makefile.in via config.status
+# whenever it changes.
+SUBDIR := $(patsubst $(abspath @top_builddir@)/%,%,$(CURDIR))
+
+Makefile: Makefile.in @top_builddir@/config.status
+	cd @top_builddir@ && $(SHELL) ./config.status $(SUBDIR)/Makefile
+
 read_duration_test_TESTS := test_read_duration.pf
 read_duration_test_OTHER_LIBRARIES = -L@top_builddir@/src/.libs -lneko @LDFLAGS@ @LIBS@
 $(eval $(call make_pfunit_test,read_duration_test))
diff --git a/tests/unit/vector/Makefile.in b/tests/unit/vector/Makefile.in
index 9af66165dc5e..e1d691e4c5aa 100644
--- a/tests/unit/vector/Makefile.in
+++ b/tests/unit/vector/Makefile.in
@@ -5,12 +5,22 @@ endif
 FFLAGS += $(PFUNIT_EXTRA_FFLAGS) @NEKO_PKG_FCFLAGS@ -I@top_builddir@/src
 FC = @FC@
 
-%.o : %.F90
+# Depend on the library so the test objects follow any change to Neko.
+NEKO_LIB := $(wildcard @top_builddir@/src/libneko.la)
+
+%.o : %.F90 $(NEKO_LIB)
 	$(FC) -c $(FFLAGS) $<
 
 
 check: vector_suite
 
+# Regenerate this Makefile from Makefile.in via config.status
+# whenever it changes.
+SUBDIR := $(patsubst $(abspath @top_builddir@)/%,%,$(CURDIR))
+
+Makefile: Makefile.in @top_builddir@/config.status
+	cd @top_builddir@ && $(SHELL) ./config.status $(SUBDIR)/Makefile
+
 
 vector_suite_TESTS := test_vector_parallel.pf
 vector_suite_OTHER_LIBRARIES = -L@top_builddir@/src/.libs -lneko @LDFLAGS@ @LIBS@
diff --git a/tests/unit/vtkhdf/Makefile.in b/tests/unit/vtkhdf/Makefile.in
index 6d2cffe81041..9e704626bd79 100644
--- a/tests/unit/vtkhdf/Makefile.in
+++ b/tests/unit/vtkhdf/Makefile.in
@@ -5,12 +5,22 @@ endif
 FFLAGS += $(PFUNIT_EXTRA_FFLAGS) @NEKO_PKG_FCFLAGS@ -I@top_builddir@/src
 FC = @FC@
 
-%.o : %.F90
+# Depend on the library so the test objects follow any change to Neko.
+NEKO_LIB := $(wildcard @top_builddir@/src/libneko.la)
+
+%.o : %.F90 $(NEKO_LIB)
 	$(FC) -c $(FFLAGS) $<
 
 
 check: vtkhdf_suite
 
+# Regenerate this Makefile from Makefile.in via config.status
+# whenever it changes.
+SUBDIR := $(patsubst $(abspath @top_builddir@)/%,%,$(CURDIR))
+
+Makefile: Makefile.in @top_builddir@/config.status
+	cd @top_builddir@ && $(SHELL) ./config.status $(SUBDIR)/Makefile
+
 
 vtkhdf_suite_TESTS := vtkhdf_parallel.pf
 vtkhdf_suite_OTHER_LIBRARIES = -L@top_builddir@/src/.libs -lneko @LDFLAGS@ @LIBS@
diff --git a/tests/unit/wall_sampling/Makefile.in b/tests/unit/wall_sampling/Makefile.in
index 2d5b1a84f753..71dfae5dd587 100644
--- a/tests/unit/wall_sampling/Makefile.in
+++ b/tests/unit/wall_sampling/Makefile.in
@@ -5,12 +5,22 @@ endif
 FFLAGS += $(PFUNIT_EXTRA_FFLAGS) @NEKO_PKG_FCFLAGS@ -I@top_builddir@/src
 FC = @FC@
 
-%.o : %.F90
+# Depend on the library so the test objects follow any change to Neko.
+NEKO_LIB := $(wildcard @top_builddir@/src/libneko.la)
+
+%.o : %.F90 $(NEKO_LIB)
 	$(FC) -c $(FFLAGS) $<
 
 
 check: wall_sampling_suite
 
+# Regenerate this Makefile from Makefile.in via config.status
+# whenever it changes.
+SUBDIR := $(patsubst $(abspath @top_builddir@)/%,%,$(CURDIR))
+
+Makefile: Makefile.in @top_builddir@/config.status
+	cd @top_builddir@ && $(SHELL) ./config.status $(SUBDIR)/Makefile
+
 
 wall_sampling_suite_TESTS := test_base.pf\
     test_gll.pf\