diff --git a/testing/external/scripts/create-new-repo b/testing/external/scripts/create-new-repo
index 8c3bacc0ef..8d64d73ca3 100755
--- a/testing/external/scripts/create-new-repo
+++ b/testing/external/scripts/create-new-repo
@@ -27,7 +27,7 @@ git clone $repo $name
 
 cd $name
 
-for dir in Traces tests Baseline; do
+for dir in tests Baseline; do
     mkdir $dir
     touch $dir/.gitignore
 done
diff --git a/testing/external/scripts/diff-all b/testing/external/scripts/diff-all
new file mode 100755
index 0000000000..e87174fdbd
--- /dev/null
+++ b/testing/external/scripts/diff-all
@@ -0,0 +1,27 @@
+#! /usr/bin/env bash
+#
+# Runs btest-diff on $@ and fails if any fails.
+
+diag=$TEST_DIAGNOSTICS
+
+export TEST_DIAGNOSTICS=$diag.tmp
+
+if [ "$diag" = "" ]; then
+    diag=/dev/stdout
+else
+    rm -f $diag
+fi
+
+rc=0;
+
+for i in $@; do
+    if ! btest-diff $i; then
+       echo "" >>$diag
+       echo "#### btest-diff $i" >>$diag
+       echo "" >>$diag
+       cat $diag.tmp >>$diag
+       rc=1
+    fi
+done
+
+exit $rc
diff --git a/testing/external/scripts/skel/test.skeleton b/testing/external/scripts/skel/test.skeleton
index 46a8f7a48d..e0291d70df 100644
--- a/testing/external/scripts/skel/test.skeleton
+++ b/testing/external/scripts/skel/test.skeleton
@@ -1,2 +1,2 @@
-@TEST-EXEC: bro -r $TRACES/test.trace test-all
-@TEST-EXEC: for i in *.log; do btest-diff $i; done
+@TEST-EXEC: zcat $TRACES/test.trace.gz | bro -r - test-all-policy
+@TEST-EXEC: $SCRIPTS/diff-all *.log
diff --git a/testing/external/scripts/skel/traces.cfg b/testing/external/scripts/skel/traces.cfg
index b3184cc7c2..705207c151 100644
--- a/testing/external/scripts/skel/traces.cfg
+++ b/testing/external/scripts/skel/traces.cfg
@@ -1,7 +1,4 @@
 #
 # Format:
 #
-# <url> <md5sum>
-#
-# Use scripts/make-md5sum to calculate the md5sum.
-#
+# <url> [<http-user>[:<http-password>]]
diff --git a/testing/external/scripts/update-traces b/testing/external/scripts/update-traces
index fc1f515fff..221fe21b3e 100755
--- a/testing/external/scripts/update-traces
+++ b/testing/external/scripts/update-traces
@@ -25,6 +25,8 @@ for proxy in .proxy ../.proxy; do
     fi
 done
 
+mkdir -p $1
+
 cat $cfg | while read line; do
 
     if echo $line | grep -q '^[ \t]*$'; then
@@ -36,7 +38,7 @@ cat $cfg | while read line; do
     fi
 
     url=`echo $line | awk '{print $1}'`
-    auth=`echo $line | awk '{print $3}'`
+    auth=`echo $line | awk '{print $2}'`
 
     file=$1/`echo $url | sed 's#^.*/##g'`
     fp=$file.md5sum
@@ -47,7 +49,7 @@ cat $cfg | while read line; do
 
     # Get the fingerprint file.
     if ! eval "$proxy curl $auth -fsS --anyauth $url.md5sum -o $fp.tmp"; then
-        echo "Error: Could not get $url.fingerprint, skipping download."
+        echo "Error: Could not get $url.md5sum, skipping download."
         continue
     fi
 
diff --git a/testing/external/subdir-btest.cfg b/testing/external/subdir-btest.cfg
index 18938ec985..7bcb602bf5 100644
--- a/testing/external/subdir-btest.cfg
+++ b/testing/external/subdir-btest.cfg
@@ -11,7 +11,7 @@ BRO_SEED_FILE=%(testbase)s/../random.seed
 TZ=UTC
 LC_ALL=C
 PATH=%(testbase)s/../../../build/src:%(testbase)s/../../../aux/btest:%(default_path)s
-TEST_DIFF_CANONIFIER=%(testbase)s/../../btest/Scripts/diff-canonifier-external
+TEST_DIFF_CANONIFIER=%(testbase)s/../../scripts/diff-canonifier-external
 TRACES=%(testbase)s/Traces
 SCRIPTS=%(testbase)s/../scripts
 DIST=%(testbase)s/../../..