diff --git a/Demo/rpc/test b/Demo/rpc/test
new file mode 100755
index 00000000000..abb241f0b35
--- /dev/null
+++ b/Demo/rpc/test
@@ -0,0 +1,22 @@
+: ${PYTHON=python}
+
+set -xe
+
+$PYTHON -c 'from rpc import test; test()'
+$PYTHON -c 'from rpc import test; test()' charon.cwi.nl
+
+$PYTHON -c 'from rpc import testsvr; testsvr()' &
+SVR=$!
+$PYTHON -c 'from rpc import testclt; testclt()'
+kill -2 $SVR
+
+$PYTHON -c 'from mountclient import test; test()'
+$PYTHON -c 'from mountclient import test; test()' gatekeeper.dec.com
+
+$PYTHON -c 'from nfsclient import test; test()'
+$PYTHON -c 'from nfsclient import test; test()' gatekeeper.dec.com
+$PYTHON -c 'from nfsclient import test; test()' gatekeeper.dec.com /archive
+
+$PYTHON -c 'from rnusersclient import test; test()' ''
+
+$PYTHON -c 'from rpc import testbcast; testbcast()'