diff --git a/test/test-health b/test/test-health
index 343f29c..24afa79 100755
--- a/test/test-health
+++ b/test/test-health
adapter = dbus.Interface(bus.get_object(BUS_NAME, select), ADAPTER_INTERFACE)
-devices = adapter.GetProperties()["Devices"]
+devices = []
+for path, interfaces in objects.iteritems():
+ if "org.bluez.Device1" not in interfaces:
+ continue
+ properties = interfaces["org.bluez.Device1"]
+ if properties["Adapter"] != select:
+ continue;
+
+ if HEALTH_DEVICE_INTERFACE not in interfaces:
+ continue
+ devices.append(path)
if len(devices) == 0:
print("No devices available")
diff --git a/test/test-health-sink b/test/test-health-sink
index 52be535..2343a23 100755
--- a/test/test-health-sink
+++ b/test/test-health-sink
adapter = dbus.Interface(bus.get_object(BUS_NAME, select),
ADAPTER_INTERFACE)
-devices = adapter.GetProperties()["Devices"]
+devices = []
+for path, interfaces in objects.iteritems():
+ if "org.bluez.Device1" not in interfaces:
+ continue
+ properties = interfaces["org.bluez.Device1"]
+ if properties["Adapter"] != select:
+ continue;
+
+ if HEALTH_DEVICE_INTERFACE not in interfaces:
+ continue
+ devices.append(path)
if len(devices) == 0:
print("No devices available")