diff --git a/ChangeLog b/ChangeLog
index a909f6b6..353a3401 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@
   * Issue #432: answer_ipv4_address and answer_ipv6_address in reply
     and response dicts.
   * Issue #430: Record and guard UDP max payload size with servers.
+  * Issue #407: Run only offline-tests option with:
+    src/test/tpkg/run-offline-only.sh (only with git checkouts).
 
 * 2019-12-20: Version 1.6.0-beta.1
   * Migration of build system to cmake. Build now works on Ubuntu,
diff --git a/project-doc/packages.txt b/project-doc/packages.txt
index 7e40a201..25e1c79b 100644
--- a/project-doc/packages.txt
+++ b/project-doc/packages.txt
@@ -15,3 +15,6 @@ https://github.com/astlinux-project/astlinux/tree/master/package/getdns
 
 For Genode, created and maintained by Emery Hemingway (ehmry)
 https://github.com/genodelabs/genode/blob/master/repos/ports/ports/getdns.port
+
+For Gentoo, created and maintained by CaseOf (Quentin R.?)
+https://packages.gentoo.org/packages/net-dns/getdns
diff --git a/src/test/tpkg/run-offline-only.sh b/src/test/tpkg/run-offline-only.sh
new file mode 100755
index 00000000..7fea9a49
--- /dev/null
+++ b/src/test/tpkg/run-offline-only.sh
@@ -0,0 +1,27 @@
+#!/bin/sh
+
+export SRCDIR=`dirname $0`
+. `dirname $0`/setup-env.sh
+
+control_c()
+# run if user hits control-c
+{
+  echo -en "\n*** Exiting ***\n"
+  exit $?
+}
+
+for TEST_PKG in 080-iana-rr-types.tpkg 125-valgrind-checks.tpkg \
+	    130-run-unit-tests.tpkg 225-stub-only-valgrind-checks.tpkg \
+	    230-stub-only-run-unit-tests.tpkg 270-header-extension.tpkg \
+	    290-transports.tpkg 330-event-loops-unit-tests.tpkg \
+	    340-run-stubby.tpkg
+do
+	"${TPKG}" $* fake "${TEST_PKG}"
+done
+for TEST_PKG in ${SRCDIR}/*.tpkg
+do
+	"${TPKG}" $* exe "${TEST_PKG}"
+	# trap keyboard interrupt (control-c)
+	trap control_c 2
+done
+"${TPKG}" -n -1 r