diff --git a/tempest/tests/boto/__init__.py b/tempest/tests/boto/__init__.py
index 6d5149e..dd224d6 100644
--- a/tempest/tests/boto/__init__.py
+++ b/tempest/tests/boto/__init__.py
@@ -27,9 +27,9 @@
 from tempest.common.utils.file_utils import have_effective_read_access
 import tempest.config
 
-A_I_IMAGES_READY = False  # ari,ami,aki
-S3_CAN_CONNECT_ERROR = "Unknown Error"
-EC2_CAN_CONNECT_ERROR = "Unknown Error"
+A_I_IMAGES_READY = True  # ari,ami,aki
+S3_CAN_CONNECT_ERROR = None
+EC2_CAN_CONNECT_ERROR = None
 
 
 def generic_setup_package():
@@ -76,8 +76,6 @@
                                 " faild to get them even by keystoneclient"
     except Exception as exc:
         EC2_CAN_CONNECT_ERROR = str(exc)
-    else:
-        EC2_CAN_CONNECT_ERROR = None
 
     try:
         if urlparse.urlparse(config.boto.s3_url).hostname is None:
@@ -93,6 +91,4 @@
     except keystoneclient.exceptions.Unauthorized:
         S3_CAN_CONNECT_ERROR = "AWS credentials not set," +\
                                " faild to get them even by keystoneclient"
-    else:
-        S3_CAN_CONNECT_ERROR = None
     boto_logger.setLevel(level)
diff --git a/tempest/tests/compute/__init__.py b/tempest/tests/compute/__init__.py
index 5b59a70..a3c6380 100644
--- a/tempest/tests/compute/__init__.py
+++ b/tempest/tests/compute/__init__.py
@@ -30,10 +30,10 @@
 RESIZE_AVAILABLE = CONFIG.compute.resize_available
 CHANGE_PASSWORD_AVAILABLE = CONFIG.compute.change_password_available
 WHITEBOX_ENABLED = CONFIG.whitebox.whitebox_enabled
-DISK_CONFIG_ENABLED = False
+DISK_CONFIG_ENABLED = True
 DISK_CONFIG_ENABLED_OVERRIDE = CONFIG.compute.disk_config_enabled_override
-FLAVOR_EXTRA_DATA_ENABLED = False
-MULTI_USER = False
+FLAVOR_EXTRA_DATA_ENABLED = True
+MULTI_USER = True
 
 
 # All compute tests -- single setup function
@@ -66,12 +66,12 @@
     # used in testing. If the test cases are allowed to create
     # users (config.compute.allow_tenant_isolation is true,
     # then we allow multi-user.
-    if CONFIG.compute.allow_tenant_isolation:
-        MULTI_USER = True
-    else:
+    if not CONFIG.compute.allow_tenant_isolation:
         user1 = CONFIG.identity.username
         user2 = CONFIG.identity.alt_username
-        if user2 and user1 != user2:
+        if not user2 or user1 == user2:
+            MULTI_USER = False
+        else:
             user2_password = CONFIG.identity.alt_password
             user2_tenant_name = CONFIG.identity.alt_tenant_name
             if not user2_password or not user2_tenant_name:
@@ -79,7 +79,6 @@
                        "tenant or password: alt_tenant_name=%s alt_password=%s"
                        % (user2_tenant_name, user2_password))
                 raise InvalidConfiguration(msg)
-            MULTI_USER = True
 
 
 class ComputeResource(TestResourceManager):