diff --git a/client/samples/filesystem b/client/samples/filesystem
index 09d0d4a..dc8b2bd 100755
--- a/client/samples/filesystem
+++ b/client/samples/filesystem
@@ -10,14 +10,16 @@
 # and I have yet to point run-bash-shared-mapping at it.
 # (different mount options for ext3)
 
-for fstype in ('ext2', 'ext3', 'jfs', 'xfs', 'reiserfs'):
+def test_fs():
 	fs.mkfs(fstype)
 	fs.mount()
 	try:
 		job.run_test('fsx', job.tmpdir, tag=fstype)
 		job.run_test('iozone', job.tmpdir, tag=fstype)
 		job.run_test('dbench', dir=job.tmpdir, tag=fstype)
-		fs.fsck()
 	finally:
 		fs.unmount()
+		fs.fsck()
 
+for fstype in ('ext2', 'ext3', 'jfs', 'xfs', 'reiserfs'):
+	job.run_group(test_fs)