diff --git a/tests/test_jail.py b/tests/test_jail.py
index dd45c5d..2570f8a 100644
--- a/tests/test_jail.py
+++ b/tests/test_jail.py
@@ -1,6 +1,11 @@
-from focker.jail import backup_file
+from focker.jail import backup_file, \
+    jail_fs_create
 import tempfile
 import os
+import subprocess
+from focker.zfs import zfs_mountpoint, \
+    zfs_exists, \
+    zfs_tag
 
 
 def test_backup_file():
@@ -26,3 +31,37 @@ def test_backup_file():
                     assert f.read() == str(i + 9)
                 else:
                     assert f.read() == str(i - 1)
+
+
+def test_jail_fs_create_01():
+    subprocess.check_output(['focker', 'image', 'remove', '--force', '-R', 'test-jail-fs-create-01'])
+    subprocess.check_output(['focker', 'bootstrap', '--empty', '-t', 'test-jail-fs-create-01'])
+    name = jail_fs_create('test-jail-fs-create-01')
+    assert zfs_exists(name)
+    mountpoint = zfs_mountpoint(name)
+    assert os.path.exists(mountpoint)
+    with open(os.path.join(mountpoint, 'test.txt'), 'w') as f:
+        f.write('test\n')
+    assert os.path.exists(os.path.join(mountpoint, 'test.txt'))
+    with open(os.path.join(mountpoint, 'test.txt'), 'r') as f:
+        assert f.read() == 'test\n'
+    subprocess.check_output(['focker', 'image', 'remove', '-R', 'test-jail-fs-create-01'])
+    assert not zfs_exists(name)
+    assert not os.path.exists(mountpoint)
+
+
+def test_jail_fs_create_02():
+    subprocess.check_output(['focker', 'jail', 'remove', '--force', 'test-jail-fs-create-02'])
+    name = jail_fs_create()
+    zfs_tag(name, ['test-jail-fs-create-02'])
+    assert zfs_exists(name)
+    mountpoint = zfs_mountpoint(name)
+    assert os.path.exists(mountpoint)
+    with open(os.path.join(mountpoint, 'test.txt'), 'w') as f:
+        f.write('test\n')
+    assert os.path.exists(os.path.join(mountpoint, 'test.txt'))
+    with open(os.path.join(mountpoint, 'test.txt'), 'r') as f:
+        assert f.read() == 'test\n'
+    subprocess.check_output(['focker', 'jail', 'remove', 'test-jail-fs-create-02'])
+    assert not zfs_exists(name)
+    assert not os.path.exists(mountpoint)