diff --git a/src/interfaces/ecpg/Makefile b/src/interfaces/ecpg/Makefile
index 35fe094adf..4b2694335e 100644
--- a/src/interfaces/ecpg/Makefile
+++ b/src/interfaces/ecpg/Makefile
@@ -8,6 +8,7 @@ all install installdirs uninstall dep depend distprep:
 	$(MAKE) -C ecpglib $@
 	$(MAKE) -C compatlib $@
 	$(MAKE) -C preproc $@
+	$(MAKE) -C test $@
 
 clean distclean maintainer-clean:
 	-$(MAKE) -C include $@
@@ -16,3 +17,6 @@ clean distclean maintainer-clean:
 	-$(MAKE) -C compatlib $@
 	-$(MAKE) -C preproc $@
 	-$(MAKE) -C test clean
+
+check: all
+	$(MAKE) -C test $@
diff --git a/src/interfaces/ecpg/test/pgtypeslib/Makefile b/src/interfaces/ecpg/test/pgtypeslib/Makefile
new file mode 100644
index 0000000000..d019a35d88
--- /dev/null
+++ b/src/interfaces/ecpg/test/pgtypeslib/Makefile
@@ -0,0 +1,11 @@
+subdir = src/interfaces/ecpg/test/pgtypeslib
+top_builddir = ../../../../..
+include $(top_builddir)/src/Makefile.global
+include ../Makefile.regress
+
+TESTS = dt_test dt_test.c \
+        dt_test2 dt_test2.c \
+        num_test num_test.c
+
+all: $(TESTS)
+
diff --git a/src/interfaces/ecpg/test/sql/Makefile b/src/interfaces/ecpg/test/sql/Makefile
new file mode 100644
index 0000000000..0be0fa0870
--- /dev/null
+++ b/src/interfaces/ecpg/test/sql/Makefile
@@ -0,0 +1,20 @@
+subdir = src/interfaces/ecpg/test/sql
+top_builddir = ../../../../..
+include $(top_builddir)/src/Makefile.global
+include ../Makefile.regress
+
+TESTS = define define.c \
+        dyntest dyntest.c \
+        dyntest2 dyntest2.c \
+        code100 code100.c \
+        desc desc.c \
+        dynalloc dynalloc.c \
+        dynalloc2 dynalloc2.c \
+        func func.c \
+        indicators indicators.c \
+        quote quote.c \
+        show show.c \
+        copystdout copystdout.c
+
+all: $(TESTS)
+
diff --git a/src/interfaces/ecpg/test/thread/Makefile b/src/interfaces/ecpg/test/thread/Makefile
new file mode 100644
index 0000000000..5b25c4a74a
--- /dev/null
+++ b/src/interfaces/ecpg/test/thread/Makefile
@@ -0,0 +1,11 @@
+subdir = src/interfaces/ecpg/test/thread
+top_builddir = ../../../../..
+include $(top_builddir)/src/Makefile.global
+include ../Makefile.regress
+
+
+TESTS = thread_implicit thread_implicit.c \
+        thread thread.c
+
+all: $(TESTS)
+