diff --git a/daemon/btrfs.c b/daemon/btrfs.c
index 8569173ef..b0218bc8d 100644
--- a/daemon/btrfs.c
+++ b/daemon/btrfs.c
@@ -582,9 +582,11 @@ do_btrfs_device_delete (char *const *devices, const char *fs)
   ADD_ARG (argv, i, "btrfs");
   ADD_ARG (argv, i, "device");
   ADD_ARG (argv, i, "delete");
+
   for (j = 0; j < nr_devices; ++j)
     ADD_ARG (argv, i, devices[j]);
-  ADD_ARG (argv, i, fs);
+
+  ADD_ARG (argv, i, fs_buf);
   ADD_ARG (argv, i, NULL);
 
   r = commandv (NULL, &err, argv);
diff --git a/tests/btrfs/test-btrfs-devices.sh b/tests/btrfs/test-btrfs-devices.sh
index 546ce7c57..ea1c88171 100755
--- a/tests/btrfs/test-btrfs-devices.sh
+++ b/tests/btrfs/test-btrfs-devices.sh
@@ -48,9 +48,7 @@ mkdir /foo
 touch /foo/bar
 
 btrfs-device-add "/dev/sdc1 /dev/sdd1" /
-
-# I cannot get this to work, seems to be a btrfs bug:
-#btrfs-device-delete "/dev/sda1 /dev/sdb1" /
+btrfs-device-delete "/dev/sda1 /dev/sdb1" /
 
 EOF