diff --git a/testsuite/daemon.test b/testsuite/daemon.test
index 028fc788..869feab5 100644
--- a/testsuite/daemon.test
+++ b/testsuite/daemon.test
@@ -24,42 +24,7 @@
 
 . "$suitedir/rsync.fns"
 
-# Build an appropriate configuration file
-conf="$scratchdir/test-rsyncd.conf"
-echo "building configuration $conf"
-
-port=2612
-pidfile="$scratchdir/rsyncd.pid"
-logfile="$scratchdir/rsyncd.log"
-
-cat >$conf <<EOF
-# rsyncd configuration file autogenerated by $0
-
-pid file = $pidfile
-use chroot = no
-hosts allow = localhost, 127.0.0.1
-log file = $logfile
-
-[test-from] = $scratchdir/daemon-from/
-	read only = yes
-
-[test-to] = $scratchdir/daemon-to/
-	read only = no
-
-EOF
+build_rsyncd_conf
+start_rsyncd
 
 
-
-echo starting daemon
-$rsync_bin --daemon --port $port --config $conf
-sleep 2
-pid=`cat "$pidfile"`
-echo rsyncd running as process $pid
-
-
-# We need to make sure that we always kill rsync, even if there's an
-# error.  Otherwise it might hang around, and be insecure or at any
-# rate keep the port bound and prevent the tests running in the
-# future.
-
-trap "echo killing off process $pid; kill $pid" EXIT
diff --git a/testsuite/rsync.fns b/testsuite/rsync.fns
index 40c96590..8452853e 100644
--- a/testsuite/rsync.fns
+++ b/testsuite/rsync.fns
@@ -111,19 +111,18 @@ function build_rsyncd_conf {
     logfile="$scratchdir/rsyncd.log"
 
     cat >$conf <<EOF
-    # rsyncd configuration file autogenerated by $0
+# rsyncd configuration file autogenerated by $0
 
-    pid file = $pidfile
-    use chroot = no
-    hosts allow = localhost, 127.0.0.1
-    log file = $logfile
+pid file = $pidfile
+use chroot = no
+hosts allow = localhost, 127.0.0.1
+log file = $logfile
 
-    [test-from] = $scratchdir/daemon-from/
-	    read only = yes
-
-    [test-to] = $scratchdir/daemon-to/
-	    read only = no
+[test-from] = $scratchdir/daemon-from/
+	read only = yes
 
+[test-to] = $scratchdir/daemon-to/
+	read only = no
 EOF
 }