diff --git a/tests/virtual-device.py b/tests/virtual-device.py
index e15b4327..ed18611e 100644
--- a/tests/virtual-device.py
+++ b/tests/virtual-device.py
@@ -235,10 +235,11 @@ class VirtualDeviceBase(unittest.TestCase):
         self.assertEqual(self.dev.get_finger_status(), FPrint.FingerStatusFlags.NONE)
 
         self.assertEqual(self._enrolled.get_device_stored(),
-            self.dev.has_storage())
+            bool(self.dev.get_features() & FPrint.DeviceFeature.STORAGE))
         self.assertEqual(self._enrolled.props.driver, self.dev.get_driver())
         self.assertEqual(self._enrolled.props.device_id, self.dev.get_device_id())
-        self.assertEqual(self._enrolled.props.device_stored, self.dev.has_storage())
+        self.assertEqual(self._enrolled.props.device_stored,
+                         bool(self.dev.get_features() & FPrint.DeviceFeature.STORAGE))
         self.assertEqual(self._enrolled.props.fpi_data.unpack(), nick)
         self.assertIsNone(self._enrolled.props.image)
 
@@ -322,7 +323,8 @@ class VirtualDeviceBase(unittest.TestCase):
             else:
                 self.assertFalse(match)
 
-        if isinstance(scan_nick, str) and not self.dev.has_storage():
+        if (isinstance(scan_nick, str) and not
+            self.dev.get_features() & FPrint.DeviceFeature.STORAGE):
             self.assertEqual(self._verify_fp.props.fpi_data.get_string(), scan_nick)
 
 
@@ -592,7 +594,7 @@ class VirtualDevice(VirtualDeviceBase):
         self.send_command('SCAN', 'another-id')
         verify_match, verify_fp = self.dev.verify_sync(enrolled)
         self.assertFalse(verify_match)
-        if self.dev.has_storage():
+        if self.dev.get_features() & FPrint.DeviceFeature.STORAGE:
             self.assertIsNone(verify_fp)
         else:
             self.assertFalse(verify_fp.equal(enrolled))
diff --git a/tests/virtual-image.py b/tests/virtual-image.py
index e4a464eb..cd2764d2 100755
--- a/tests/virtual-image.py
+++ b/tests/virtual-image.py
@@ -234,7 +234,8 @@ class VirtualImage(unittest.TestCase):
         self.assertEqual(self.dev.get_finger_status(), FPrint.FingerStatusFlags.NONE)
         self.assertEqual(self._enrolled.props.driver, self.dev.get_driver())
         self.assertEqual(self._enrolled.props.device_id, self.dev.get_device_id())
-        self.assertEqual(self._enrolled.props.device_stored, self.dev.has_storage())
+        self.assertEqual(self._enrolled.props.device_stored,
+                         bool(self.dev.get_features() & FPrint.DeviceFeature.STORAGE))
         self.assertIsNone(self._enrolled.get_image())
 
         return self._enrolled