diff --git a/tests/fprintd.py b/tests/fprintd.py
index 04317b9..94f16d9 100644
--- a/tests/fprintd.py
+++ b/tests/fprintd.py
@@ -605,11 +605,16 @@ class FPrintdVirtualDeviceBaseTest(FPrintdVirtualImageDeviceBaseTests):
         if expected is not None:
             self.assertEqual(self._last_result, expected)
 
-    def enroll_image(self, img, device=None, finger='right-index-finger', expected_result='enroll-completed'):
-        self._maybe_reduce_enroll_stages()
-
+    def enroll_image(self, img, device=None, finger='right-index-finger',
+                     expected_result='enroll-completed', claim_user=None):
         if device is None:
             device = self.device
+        if claim_user:
+            device.Claim('(s)', claim_user)
+
+        if device is self.device:
+            self._maybe_reduce_enroll_stages()
+
         device.EnrollStart('(s)', finger)
 
         while not self.finger_needed:
@@ -629,6 +634,9 @@ class FPrintdVirtualDeviceBaseTest(FPrintdVirtualImageDeviceBaseTests):
         self.assertEqual(self._last_result, expected_result)
         self.assertFalse(self.finger_needed)
 
+        if claim_user:
+            device.Release()
+
     def enroll_multiple_images(self, images_override={}, return_index=-1):
         enroll_map = {
             'left-thumb': 'whorl',