diff --git a/tests/integration/manifests/oldstable64.yml b/tests/integration/manifests/oldstable64.yml
new file mode 100644
index 0000000..3281ca7
--- /dev/null
+++ b/tests/integration/manifests/oldstable64.yml
@@ -0,0 +1,4 @@
+---
+system:
+  release: oldstable
+  architecture: amd64
diff --git a/tests/integration/virtualbox_tests.py b/tests/integration/virtualbox_tests.py
index 6e2e122..0d5c20a 100644
--- a/tests/integration/virtualbox_tests.py
+++ b/tests/integration/virtualbox_tests.py
@@ -1,5 +1,6 @@
 from manifests import merge_manifest_data
 from tools.bootable_manifest import BootableManifest
+from nose.plugins.skip import Skip
 
 partials = {'vbox': 'provider: {name: virtualbox}',
             'vdi': 'volume: {backing: vdi}',
@@ -7,10 +8,84 @@ partials = {'vbox': 'provider: {name: virtualbox}',
             }
 
 
-def test_virtualbox_partitioned_extlinux():
-	std_partials = ['base', 'stable64', 'extlinux', 'msdos', 'single_partition',
+def test_unpartitioned_extlinux_oldstable():
+	std_partials = ['base', 'oldstable64', 'extlinux', 'unpartitioned',
 	                'root_password', 'apt_proxy']
-	custom_partials = [partials['vbox'], partials['vdi']]
+	custom_partials = [partials['vbox'], partials['vmdk']]
+	manifest_data = merge_manifest_data(std_partials, custom_partials)
+	with BootableManifest(manifest_data) as instance:
+		print(instance.console_output)
+
+
+def test_partitioned_extlinux_oldstable():
+	std_partials = ['base', 'oldstable64', 'extlinux', 'msdos', 'single_partition',
+	                'root_password', 'apt_proxy']
+	custom_partials = [partials['vbox'], partials['vmdk']]
+	manifest_data = merge_manifest_data(std_partials, custom_partials)
+	with BootableManifest(manifest_data) as instance:
+		print(instance.console_output)
+
+
+def test_partitioned_grub_oldstable():
+	std_partials = ['base', 'oldstable64', 'grub', 'msdos', 'single_partition',
+	                'root_password', 'apt_proxy']
+	custom_partials = [partials['vbox'], partials['vmdk']]
+	manifest_data = merge_manifest_data(std_partials, custom_partials)
+	with BootableManifest(manifest_data) as instance:
+		print(instance.console_output)
+
+
+def test_unpartitioned_extlinux():
+	std_partials = ['base', 'stable64', 'extlinux', 'unpartitioned',
+	                'root_password', 'apt_proxy']
+	custom_partials = [partials['vbox'], partials['vmdk']]
+	manifest_data = merge_manifest_data(std_partials, custom_partials)
+	with BootableManifest(manifest_data) as instance:
+		print(instance.console_output)
+
+
+def test_partitioned_extlinux():
+	std_partials = ['base', 'stable64', 'extlinux', 'msdos', 'single_partition',
+	                'root_password', 'apt_proxy']
+	custom_partials = [partials['vbox'], partials['vmdk']]
+	manifest_data = merge_manifest_data(std_partials, custom_partials)
+	with BootableManifest(manifest_data) as instance:
+		print(instance.console_output)
+
+
+def test_partitioned_grub():
+	std_partials = ['base', 'stable64', 'grub', 'msdos', 'single_partition',
+	                'root_password', 'apt_proxy']
+	custom_partials = [partials['vbox'], partials['vmdk']]
+	manifest_data = merge_manifest_data(std_partials, custom_partials)
+	with BootableManifest(manifest_data) as instance:
+		print(instance.console_output)
+
+
+def test_unpartitioned_extlinux_unstable():
+	raise Skip('Jessie not yet working with extlinux')
+	std_partials = ['base', 'unstable64', 'extlinux', 'msdos', 'unpartitioned',
+	                'root_password', 'apt_proxy']
+	custom_partials = [partials['vbox'], partials['vmdk']]
+	manifest_data = merge_manifest_data(std_partials, custom_partials)
+	with BootableManifest(manifest_data) as instance:
+		print(instance.console_output)
+
+
+def test_partitioned_extlinux_unstable():
+	raise Skip('Jessie not yet working with extlinux')
+	std_partials = ['base', 'unstable64', 'extlinux', 'msdos', 'single_partition',
+	                'root_password', 'apt_proxy']
+	custom_partials = [partials['vbox'], partials['vmdk']]
+	manifest_data = merge_manifest_data(std_partials, custom_partials)
+	with BootableManifest(manifest_data) as instance:
+		print(instance.console_output)
+
+
+def test_partitioned_grub_unstable():
+	std_partials = ['base', 'unstable64', 'grub', 'msdos', 'single_partition',
+	                'root_password', 'apt_proxy']
+	custom_partials = [partials['vbox'], partials['vmdk']]
 	manifest_data = merge_manifest_data(std_partials, custom_partials)
 	with BootableManifest(manifest_data) as instance:
 		print(instance.console_output)