diff --git a/volttrontesting/fixtures/volttron_platform_fixtures.py b/volttrontesting/fixtures/volttron_platform_fixtures.py
index 5264c4b4fd..2e9b801905 100644
--- a/volttrontesting/fixtures/volttron_platform_fixtures.py
+++ b/volttrontesting/fixtures/volttron_platform_fixtures.py
@@ -135,7 +135,7 @@ def volttron_instance(request, **kwargs):
     """
     address = kwargs.pop("vip_address", get_rand_vip())
     if request.param['messagebus'] == 'rmq':
-        kwargs['timeout'] = 120
+        kwargs['timeout'] = 240
 
     wrapper = build_wrapper(address,
                             messagebus=request.param.get('messagebus', 'zmq'),
diff --git a/volttrontesting/utils/build_agent.py b/volttrontesting/utils/build_agent.py
index a925d9fc09..0f5b0af6f3 100644
--- a/volttrontesting/utils/build_agent.py
+++ b/volttrontesting/utils/build_agent.py
@@ -3,7 +3,6 @@
 import gevent
 
 from volttron.platform.keystore import KeyStore
-from volttron.platform.vip.agent import Agent
 from volttrontesting.utils.platformwrapper import PlatformWrapper
 
 
@@ -13,9 +12,11 @@ def build_agent(platform: PlatformWrapper, identity=None, agent_class=None):
     The agent identity will be set.  If the identity is set to None
     then a random identity will be created.
     """
+    from volttron.platform.vip.agent import Agent
+
     if agent_class is None:
         agent_class = Agent
-        
+
     os.environ['VOLTTRON_HOME'] = platform.volttron_home
     agent = platform.build_agent(identity, agent_class=agent_class)
     gevent.sleep(0.1) # switch context for a bit