diff --git a/systest/Makefile b/systest/Makefile
index 7d80dc5..df43019 100644
--- a/systest/Makefile
+++ b/systest/Makefile
@@ -192,7 +192,7 @@
 %.openstack: check_openstack_env
 	$(Q)$(MAKE) $*
 
-%s.vcd: check_vcd_env
+%.vcd: check_vcd_env
 	$(Q)$(MAKE) $*
 
 cirros: check_OSM_HOSTNAME \
diff --git a/systest/lib/vim/vim.py b/systest/lib/vim/vim.py
index f3d1753..0ac9525 100644
--- a/systest/lib/vim/vim.py
+++ b/systest/lib/vim/vim.py
@@ -23,4 +23,7 @@
         try:
             osm.get_api().vim.get(self.vim_name)
         except ClientException:
-            osm.get_api().vim.create(self.vim_name,openstack.get_access())
+            if vmware._os_access['vim-url'] and vmware._os_access['vim-type'] == 'vmware':
+                osm.get_api().vim.create(self.vim_name,vmware.get_access())
+            else:
+                osm.get_api().vim.create(self.vim_name,openstack.get_access())