diff --git a/tools/marvin/marvin/legacy/common.py b/tools/marvin/marvin/legacy/common.py
index 63bff7c2cd9..cfb8ea66872 100644
--- a/tools/marvin/marvin/legacy/common.py
+++ b/tools/marvin/marvin/legacy/common.py
@@ -21,7 +21,7 @@
 from marvin.cloudstackAPI import *
 from marvin.remoteSSHClient import remoteSSHClient
 from marvin.legacy.utils import *
-from marvin.integration.lib.base import Configurations
+from marvin.legacy.base import Configurations
 
 #Import System modules
 import time
diff --git a/tools/marvin/marvin/legacy/utils.py b/tools/marvin/marvin/legacy/utils.py
index fcfa338d514..3170ea73003 100644
--- a/tools/marvin/marvin/legacy/utils.py
+++ b/tools/marvin/marvin/legacy/utils.py
@@ -242,7 +242,7 @@ def is_snapshot_on_nfs(apiclient, dbconn, config, zoneid, snapshotid):
     @return: True if snapshot is found, False otherwise
     """
 
-    from entity import ImageStore, Snapshot
+    from base import ImageStore, Snapshot
     secondaryStores = ImageStore.list(apiclient, zoneid=zoneid)
 
     assert isinstance(secondaryStores, list), "Not a valid response for listImageStores"