diff --git a/data/lab/test_lab.yml b/data/lab/test_lab.yml
deleted file mode 100644
index 7c402407ba..0000000000
--- a/data/lab/test_lab.yml
+++ /dev/null
@@ -1,25 +0,0 @@
---- 
-lab2k:
-  file: win2k/Windows 2000 AS.vmx
-  user: Administrator
-  pass: 
-  os: windows
-  x64: false
-  tools: true
-  hostname: lab2k 
-labxp:
-  file: xpsp1/Windows XP Professional.vmx
-  user: Administrator
-  pass: administrator
-  os: windows
-  x64: false
-  tools: true
-  hostname: labxp 
-metasploitable: 
-  file: metasploitable/Metasploitable.vmx
-  user: msfadmin
-  pass: msfadmin
-  os: linux
-  x64: false
-  tools: true
-  hostname: metasploitable
diff --git a/data/lab/test_targets.yml b/data/lab/test_targets.yml
index 57b0ab7458..9e44ad423b 100644
--- a/data/lab/test_targets.yml
+++ b/data/lab/test_targets.yml
@@ -1,6 +1,27 @@
---- 
-exploit/windows/smb/psexec: 
- - lab2k
- - labxp
-exploit/unix/misc/distcc_exec:
- - metasploitable
+ - vmid: metasploitable
+   driver: Workstation
+   location: /opt/vm/msf_lab/user/Metasploitable/Metasploitable.vmx
+   tools: false
+   credentials: 
+     - user: msfadmin
+       pass: msfadmin
+       admin: true
+     - user: user
+       pass: user
+       admin: false
+ - vmid: lab2k
+   driver: Workstation
+   location: /opt/vm/msf_lab/vuln/msf_Win2000SP4/Windows 2000 AS.vmx
+   tools: true
+   credentials: 
+     - user: administrator
+       pass: 
+       admin: true
+ - vmid: labxp
+   driver: Workstation
+   location: /opt/vm/msf_lab/vuln/msf_WinXPSP1/Windows XP Professional.vmx
+   tools: true
+   credentials: 
+     - user: administrator
+       pass: administrator
+       admin: true