diff --git a/testing/btest/.gitignore b/testing/btest/.gitignore
new file mode 100644
index 0000000000..d36977dc47
--- /dev/null
+++ b/testing/btest/.gitignore
@@ -0,0 +1 @@
+.tmp
diff --git a/testing/btest/Scripts/diff-canonifier b/testing/btest/Scripts/diff-canonifier
new file mode 100755
index 0000000000..2361355491
--- /dev/null
+++ b/testing/btest/Scripts/diff-canonifier
@@ -0,0 +1,5 @@
+#! /usr/bin/env bash
+#
+# Replace anything which looks like timestamps with XXXs.
+
+sed 's/[0-9]\{10\}\.[0-9]\{4,6\}/XXXXXXXXXX.XXXXXX/g'
diff --git a/testing/btest/Scripts/known-hosts-test b/testing/btest/Scripts/known-hosts-test
new file mode 100644
index 0000000000..162b42e6f3
--- /dev/null
+++ b/testing/btest/Scripts/known-hosts-test
@@ -0,0 +1,6 @@
+
+@TEST-EXEC: bro -r %DIR/../traces/wikipedia.trace known-hosts
+
+@TEST-EXEC: btest-diff KNOWN_HOSTS
+@TEST-EXEC: btest-diff .stderr
+@TEST-EXEC: btest-diff .stdout
diff --git a/testing/btest/btest.cfg b/testing/btest/btest.cfg
new file mode 100644
index 0000000000..d5f669dc92
--- /dev/null
+++ b/testing/btest/btest.cfg
@@ -0,0 +1,13 @@
+
+[btest]
+TestDirs    = logging Scripts
+TmpDir      = %(testbase)s/.tmp
+BaselineDir = %(testbase)s/Baseline
+IgnoreDirs  = .svn CVS .tmp
+IgnoreFiles = *.tmp *.swp #* *.trace diff-canonifier
+
+[environment]
+BROPATH=`bash -c %(testbase)s/../../build/bro-path-dev`
+BRO_SEED_FILE=%(testbase)s/random.seed
+PATH=%(testbase)s/../../build/src:%(testbase)s/../../aux/btest:%(default_path)s
+TEST_DIFF_CANONIFIER=%(testbase)s/Scripts/diff-canonifier
diff --git a/testing/btest/random.seed b/testing/btest/random.seed
new file mode 100644
index 0000000000..e70c8f85ef
--- /dev/null
+++ b/testing/btest/random.seed
@@ -0,0 +1,17 @@
+2983378351
+1299727368
+0
+310447
+0
+1409073626
+3975311262
+34130240
+1450515018
+1466150520
+1342286698
+1193956778
+2188527278
+3361989254
+3912865238
+3596260151
+517973768
diff --git a/testing/btest/traces/wikipedia.trace b/testing/btest/traces/wikipedia.trace
new file mode 100644
index 0000000000..68d85e0190
Binary files /dev/null and b/testing/btest/traces/wikipedia.trace differ