diff --git a/Makefile.in b/Makefile.in
index 44d914ac22..cf74460e0e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -139,7 +139,10 @@ prelude: ${TOP_INCDIR}/afs ${TOP_INCDIR}/rx ${TOP_INCDIR}/hcrypto ${TOP_INCDIR}/
 
 project: cmd comerr 
 
-tests: all 
+tests: all_nolibafs
+	+${COMPILE_PART1} tests ${COMPILE_PART2}
+
+tests_libafs: all
 	+${COMPILE_PART1} tests ${COMPILE_PART2}
 
 config: prelude
@@ -656,7 +659,7 @@ finale_nolibafs: project cmd comerr afsd butc tbutc tbudb libuafs audit kauth lo
 rpctestlib: util fsint rx opr libafsrpc libafsauthent
 	+${TEST_PART1} rpctestlib  ${COMPILE_PART2}
 
-check test: finale
+check test: finale_nolibafs
 	cd tests && $(MAKE) check
 
 # Use washtool to ensure MakefileProto is current and obj/libafs exists.
diff --git a/configure.ac b/configure.ac
index 627781585a..036d6fc7b6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -265,6 +265,7 @@ tests/Makefile \
 tests/auth/Makefile \
 tests/cmd/Makefile \
 tests/common/Makefile \
+tests/fuse/Makefile \
 tests/opr/Makefile \
 tests/rpctestlib/Makefile \
 tests/rx/Makefile \
diff --git a/tests/TESTS b/tests/TESTS
index 59c4fb3e1e..0c08189fa1 100644
--- a/tests/TESTS
+++ b/tests/TESTS
@@ -18,3 +18,4 @@ volser/vos-man
 volser/vos
 bucoord/backup-man
 kauth/kas-man
+fuse/dynroot
diff --git a/tests/fuse/Makefile.in b/tests/fuse/Makefile.in
new file mode 100644
index 0000000000..71846c7ec5
--- /dev/null
+++ b/tests/fuse/Makefile.in
@@ -0,0 +1,13 @@
+# This software has been released under the terms of the IBM Public
+# License.  For details, see the LICENSE file in the top-level source
+# directory or online at http://www.openafs.org/dl/license10.html
+#
+# This file (software) make also be used separately from OpenAFS
+# under other licenses, contact the author(s) listed below for details.
+#
+# copyright 2011, 2012 Troy Benjegerdes <hozer@hozed.org>
+
+CELLSRV=@TOP_OBJDIR@/src/afsd/CellServDB
+
+conf/CellServDB: $(CELLSRV)
+	cp $(CELLSRV) conf/
diff --git a/tests/fuse/conf/ThisCell b/tests/fuse/conf/ThisCell
new file mode 100644
index 0000000000..ebb8cea43c
--- /dev/null
+++ b/tests/fuse/conf/ThisCell
@@ -0,0 +1 @@
+test.cell
diff --git a/tests/fuse/conf/cacheinfo b/tests/fuse/conf/cacheinfo
new file mode 100644
index 0000000000..f5fe457ee6
--- /dev/null
+++ b/tests/fuse/conf/cacheinfo
@@ -0,0 +1 @@
+mntdir:vcache:100000
diff --git a/tests/fuse/dynroot-t b/tests/fuse/dynroot-t
new file mode 100755
index 0000000000..c84eefd906
--- /dev/null
+++ b/tests/fuse/dynroot-t
@@ -0,0 +1,33 @@
+#!/bin/sh
+#
+# This software has been released under the terms of the IBM Public
+# License.  For details, see the LICENSE file in the top-level source
+# directory or online at http://www.openafs.org/dl/license10.html
+#
+# This file (software) may also be used separately from OpenAFS
+# under other licenses, contact the author(s) listed below for details.
+#
+# copyright 2011, 2012 Troy Benjegerdes <hozer@hozed.org>
+
+. tap/libtap.sh
+
+
+plan 1
+
+
+grep -e "^>" fuse/conf/CellServDB  | cut -d " " -f 1 | cut -b2- | sort > fuse/cells.tmp
+
+(cd fuse; ./try-fuse.sh > ./fuse-log 2>&1 ) &
+
+fusepid=$!
+
+sleep 1
+ls fuse/mntdir | sort > fuse/ls.tmp
+ok "ls dynroot" diff fuse/cells.tmp fuse/ls.tmp
+
+rm fuse/cells.tmp fuse/ls.tmp
+
+#not the best way to handle this
+killall afsd.fuse
+
+wait
diff --git a/tests/fuse/fuse.sh b/tests/fuse/fuse.sh
new file mode 100755
index 0000000000..10f497ad03
--- /dev/null
+++ b/tests/fuse/fuse.sh
@@ -0,0 +1,35 @@
+#!/bin/sh
+#
+# This software has been released under the terms of the IBM Public
+# License.  For details, see the LICENSE file in the top-level source
+# directory or online at http://www.openafs.org/dl/license10.html
+#
+# This file (software) may also be used separately from OpenAFS
+# under other licenses, contact the author(s) listed below for details.
+#
+# This software copyright 2011, 2012 Troy Benjegerdes <hozer@hozed.org>
+
+. ../tap/libtap.sh
+
+
+plan 1
+
+if [ ! -f "$TOPDIR/src/afsd/afsd.fuse" ] ; then
+    skip_all
+fi
+
+grep -e "^>" conf/CellServDB  | cut -d " " -f 1 | cut -b2- | sort > cells.tmp
+
+(./try-fuse.sh > fuse-log 2>&1 ) &
+
+fusepid=$!
+
+sleep 1
+ls mntdir | sort > ls.tmp
+ok "ls dynroot" diff cells.tmp ls.tmp
+
+rm cells.tmp ls.tmp
+
+kill $fusepid
+
+wait $fusepid
diff --git a/tests/fuse/try-fuse.sh b/tests/fuse/try-fuse.sh
new file mode 100755
index 0000000000..f5458f95ca
--- /dev/null
+++ b/tests/fuse/try-fuse.sh
@@ -0,0 +1,23 @@
+#!/bin/sh -x
+#
+# This software has been released under the terms of the IBM Public
+# License.  For details, see the LICENSE file in the top-level source
+# directory or online at http://www.openafs.org/dl/license10.html
+#
+# This file (software) may also be used separately from OpenAFS
+# under other licenses, contact the author(s) listed below for details.
+#
+# copyright 2011, 2012 Troy Benjegerdes <hozer@hozed.org>
+
+TESTDIR=$PWD
+TOPDIR=$PWD/../..
+
+export LD_LIBRARY_PATH=$TOPDIR/lib
+
+#in case there's a stale mount here
+fusermount -u $TESTDIR/mntdir
+
+$TOPDIR/src/afsd/afsd.fuse -dynroot -fakestat -d -confdir $TESTDIR/conf -cachedir $TESTDIR/vcache -mountdir $TESTDIR/mntdir
+
+
+fusermount -u $TESTDIR/mntdir