diff --git a/.travis.yml b/.travis.yml
index fd67a9eff78..a2f88fbbebe 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,16 +24,20 @@ jdk:
 notifications:
   email: false
 env:
-- TESTS="test_affinity_groups test_deploy_vms_with_varied_deploymentplanners test_disk_offerings test_global_settings test_guest_vlan_range test_iso"
-- TESTS="test_portable_publicip test_primary_storage test_privategw_acl test_public_ip_range test_pvlan test_regions test_reset_vm_on_reboot test_resource_detail test_routers"
-- TESTS="test_secondary_storage test_service_offerings test_ssvm test_templates"
-- TESTS="test_multipleips_per_nic test_network test_non_contigiousvlan test_over_provisioning"
-- TESTS="test_volumes test_vpc_vpn misc/test_deploy_vm test_vm_life_cycle"
+- TESTS="smoke/test_affinity_groups smoke/test_deploy_vms_with_varied_deploymentplanners smoke/test_disk_offerings smoke/test_global_settings"
+- TESTS="smoke/test_portable_publicip smoke/test_primary_storage smoke/test_privategw_acl smoke/test_public_ip_range smoke/test_pvlan smoke/test_regions"
+- TESTS="smoke/smoke/test_reset_vm_on_reboot smoke/test_resource_detail smoke/test_routers smoke/test_guest_vlan_range smoke/test_iso"
+- TESTS="smoke/test_secondary_storage smoke/test_service_offerings smoke/test_ssvm smoke/test_templates"
+- TESTS="smoke/test_multipleips_per_nic smoke/test_network smoke/test_non_contigiousvlan smoke/test_over_provisioning"
+- TESTS="smoke/test_volumes smoke/test_vpc_vpn smoke/misc/test_deploy_vm smoke/test_vm_life_cycle"
+- TESTS="component/test_acl_isolatednetwork_delete component/test_acl_isolatednetwork component/test_acl_isolatednetwork component/test_acl_listsnapshot"
+- TESTS="component/test_acl_listvm component/test_acl_listvolume component/test_acl_sharednetwork_deployVM-impersonation component/test_acl_sharednetwork"
 before_install: travis_wait 30 ./tools/travis/before_install.sh
 install: ./tools/travis/install.sh
 before_script: travis_wait 30 ./tools/travis/before_script.sh
 script:
-- mkdir -p integration-test-results/misc
+- mkdir -p integration-test-results/smoke/misc
+- mkdir -p integration-test-results/component
 - travis_wait 30 sleep 30
 - for suite in $TESTS; do travis_wait 30 nosetests --with-xunit --xunit-file=integration-test-results/$suite.xml --with-marvin --marvin-config=setup/dev/advanced.cfg test/integration/smoke/$suite.py -s -a tags=advanced,required_hardware=false --zone=Sandbox-simulator --hypervisor=simulator || true ; done
 - python ./tools/travis/xunit-reader.py integration-test-results/