diff --git a/tests/dnaprotocol b/tests/dnaprotocol
new file mode 100644
index 00000000..aed2d87c
--- /dev/null
+++ b/tests/dnaprotocol
@@ -0,0 +1,60 @@
+#!/bin/bash
+
+# Tests for Serval DNA server operations.
+#
+# Copyright 2012 Paul Gardner-Stephen
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+source "${0%/*}/../testframework.sh"
+source "${0%/*}/../testdefs.sh"
+
+setup() {
+   setup_servald
+   assert_no_servald_processes
+   set_instance
+}
+
+teardown() {
+   stop_all_servald_servers
+   kill_all_servald_processes
+   assert_no_servald_processes
+}
+
+setup_servald_instance() {
+   setup_servald
+   set_instance
+   touch "$SERVALINSTANCE_PATH/dummynet"
+   executeOk_servald config set interfaces "+>dummynet"
+   executeOk_servald keyring add
+   assert [ -e "$SERVALINSTANCE_PATH/serval.keyring" ]
+   executeOk_servald keyring list
+   tfw_cat --stdout
+   sid=$(replayStdout | sed -ne "1s/^\($rexp_sid\):.*\$/\1/p")
+   assert --message='main identity known' [ -n "$sid" ]
+   executeOk_servald set did $sid 1234567 "Agent Smith"
+   start_servald_server
+}
+
+doc_ServerStartCreateInstanceDir="DNA lookup of wildcard finds self"
+setup_ServerStartCreateInstanceDir() {
+   setup
+}
+test_ServerStartCreateInstanceDir() {
+   setup_servald_instance
+   executeOk_servald dna lookup "\*"
+}
+
+runTests "$@"