diff --git a/app/config/Makefile.am b/app/config/Makefile.am
index 68e3ea6885..c36481121c 100644
--- a/app/config/Makefile.am
+++ b/app/config/Makefile.am
@@ -85,7 +85,8 @@ test_config_LDFLAGS = \
 	-u $(SYMPREFIX)gimp_vectors_undo_get_type		\
 	-u $(SYMPREFIX)gimp_vectors_mod_undo_get_type		\
 	-u $(SYMPREFIX)gimp_vectors_prop_undo_get_type		\
-	-u $(SYMPREFIX)gimp_image_map_config_get_type
+	-u $(SYMPREFIX)gimp_image_map_config_get_type		\
+	-u $(SYMPREFIX)erode_region
 
 test_config_LDADD = \
 	../xcf/libappxcf.a			\
@@ -97,7 +98,6 @@ test_config_LDADD = \
 	../file/libappfile.a			\
 	../text/libapptext.a			\
 	../paint/libapppaint.a			\
-	../composite/libappcomposite.a		\
 	../gegl/libappgegl.a			\
 	../operations/libappoperations.a	\
 	libappconfig.a				\
diff --git a/app/tests/Makefile.am b/app/tests/Makefile.am
index 06a11a4d80..6b208b68b5 100644
--- a/app/tests/Makefile.am
+++ b/app/tests/Makefile.am
@@ -105,7 +105,6 @@ LDADD = \
 	$(top_builddir)/app/file/libappfile.a			\
 	$(top_builddir)/app/text/libapptext.a			\
 	$(top_builddir)/app/paint/libapppaint.a			\
-	$(top_builddir)/app/composite/libappcomposite.a		\
 	$(top_builddir)/app/config/libappconfig.a		\
 	$(top_builddir)/app/paint-funcs/libapppaint-funcs.a	\
 	$(top_builddir)/app/base/libappbase.a			\
diff --git a/app/tests/test-save-and-export.c b/app/tests/test-save-and-export.c
index 574a1f323a..498cd764ad 100644
--- a/app/tests/test-save-and-export.c
+++ b/app/tests/test-save-and-export.c
@@ -219,7 +219,8 @@ saved_imported_file_uris (gconstpointer data)
              proc,
              GIMP_RUN_NONINTERACTIVE,
              TRUE /*change_saved_state*/,
-             FALSE /*export*/,
+             FALSE /*export_backward*/,
+             FALSE /*export_forward*/,
              NULL /*error*/);
 
   /* Assert */
@@ -259,7 +260,8 @@ exported_file_uris (gconstpointer data)
              proc,
              GIMP_RUN_NONINTERACTIVE,
              FALSE /*change_saved_state*/,
-             TRUE /*export*/,
+             FALSE /*export_backward*/,
+             TRUE /*export_forward*/,
              NULL /*error*/);
 
   g_assert (gimp_image_get_uri (image) == NULL);
@@ -323,7 +325,8 @@ clear_import_uri_after_export (gconstpointer data)
              proc,
              GIMP_RUN_NONINTERACTIVE,
              FALSE /*change_saved_state*/,
-             TRUE /*export*/,
+             FALSE /*export_backward*/,
+             TRUE /*export_forward*/,
              NULL /*error*/);
 
   g_assert (gimp_image_get_uri (image) == NULL);
diff --git a/app/tests/test-xcf.c b/app/tests/test-xcf.c
index 7d20eff88f..3e68cbb673 100644
--- a/app/tests/test-xcf.c
+++ b/app/tests/test-xcf.c
@@ -313,7 +313,8 @@ gimp_write_and_read_file (Gimp     *gimp,
              proc,
              GIMP_RUN_NONINTERACTIVE,
              FALSE /*change_saved_state*/,
-             FALSE /*export*/,
+             FALSE /*export_backward*/,
+             FALSE /*export_forward*/,
              NULL /*error*/);
 
   /* Load from file */