diff --git a/services/core/PlatformDriverAgent/platform_driver/interfaces/modbus_tk/tests/test_battery_meter.py b/services/core/PlatformDriverAgent/platform_driver/interfaces/modbus_tk/tests/test_battery_meter.py
index 5c7a868b66..0ac107061f 100644
--- a/services/core/PlatformDriverAgent/platform_driver/interfaces/modbus_tk/tests/test_battery_meter.py
+++ b/services/core/PlatformDriverAgent/platform_driver/interfaces/modbus_tk/tests/test_battery_meter.py
@@ -387,7 +387,7 @@ def scrape_all(self, agent, device_name):
         return agent.vip.rpc.call(PLATFORM_DRIVER, 'scrape_all', device_name)\
             .get(timeout=10)
 
-    @pytest.mark.xfail(is_running_in_container(), reason='Fails to set points on this test setup, only in Docker.')
+    @pytest.mark.skip('This test has been unreliable.')
     def test_scrape_all(self, agent):
         for key in registers_dict.keys():
             self.set_point(agent, 'modbus_tk', key, registers_dict[key])
diff --git a/services/core/PlatformDriverAgent/platform_driver/interfaces/modbus_tk/tests/test_driver_demo_board.py b/services/core/PlatformDriverAgent/platform_driver/interfaces/modbus_tk/tests/test_driver_demo_board.py
index ea58ded782..593c2a684f 100644
--- a/services/core/PlatformDriverAgent/platform_driver/interfaces/modbus_tk/tests/test_driver_demo_board.py
+++ b/services/core/PlatformDriverAgent/platform_driver/interfaces/modbus_tk/tests/test_driver_demo_board.py
@@ -2,6 +2,9 @@
 
 import gevent
 import pytest
+
+from pathlib import Path
+
 from volttron.platform.agent.known_identities import CONFIGURATION_STORE, PLATFORM_DRIVER
 from volttron.platform import jsonapi
 from volttrontesting.utils.platformwrapper import PlatformWrapper
diff --git a/services/core/PlatformDriverAgent/tests/test_bacnet.py b/services/core/PlatformDriverAgent/tests/test_bacnet.py
index 6c608e42e9..476a4fc5f2 100644
--- a/services/core/PlatformDriverAgent/tests/test_bacnet.py
+++ b/services/core/PlatformDriverAgent/tests/test_bacnet.py
@@ -77,7 +77,15 @@ def test_get_point_should_succeed(bacnet_test_agent):
 
 @pytest.fixture(scope="module")
 def bacnet_proxy_agent(volttron_instance):
-    device_address = socket.gethostbyname(socket.gethostname() + ".local")
+    s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
+    s.settimeout(0)
+    try:
+        s.connect(('8.8.8.8', 1))
+        device_address = s.getsockname()[0]
+    except Exception:
+        device_address = '127.0.0.1'
+    finally:
+        s.close()
     print(f"Device address for proxy agent for testing: {device_address}")
     bacnet_proxy_agent_config = {
         "device_address": device_address,