diff --git a/heat/engine/clients/os/nova.py b/heat/engine/clients/os/nova.py
index 071ffccfac..0bb5c6d3ec 100644
--- a/heat/engine/clients/os/nova.py
+++ b/heat/engine/clients/os/nova.py
@@ -303,7 +303,8 @@ class NovaClientPlugin(client_plugin.ClientPlugin):
             return msg
 
         def read_cloudinit_file(fn):
-            return pkgutil.get_data('heat', 'cloudinit/%s' % fn)
+            return pkgutil.get_data(
+                'heat', 'cloudinit/%s' % fn).decode('utf-8')
 
         if instance_user:
             config_custom_user = 'user: %s' % instance_user
diff --git a/heat/tests/test_environment_format.py b/heat/tests/test_environment_format.py
index d797e88d75..aa97e985c1 100644
--- a/heat/tests/test_environment_format.py
+++ b/heat/tests/test_environment_format.py
@@ -53,13 +53,13 @@ parameters: }
         env = 'just string'
         expect = 'The environment is not a valid YAML mapping data type.'
         msg = self.assertRaises(ValueError, environment_format.parse, env)
-        self.assertIn(expect, msg)
+        self.assertIn(expect, msg.args)
 
     def test_parse_document(self):
         env = '["foo" , "bar"]'
         expect = 'The environment is not a valid YAML mapping data type.'
         msg = self.assertRaises(ValueError, environment_format.parse, env)
-        self.assertIn(expect, msg)
+        self.assertIn(expect, msg.args)
 
 
 class YamlParseExceptions(common.HeatTestCase):
diff --git a/py3-testlist b/py3-testlist
index 1b6842ed2e..07da68d7bc 100644
--- a/py3-testlist
+++ b/py3-testlist
@@ -1,3 +1,137 @@
-heat.tests.test_version
+heat.tests.api.aws.test_api_aws
+heat.tests.api.middleware.test_ssl_middleware
+heat.tests.api.middleware.test_version_negotiation_middleware
+heat.tests.api.openstack_v1.test_stacks_view
+heat.tests.api.openstack_v1.test_util
+heat.tests.autoscaling.test_heat_scaling_group
+heat.tests.autoscaling.test_lbutils
+heat.tests.autoscaling.test_new_capacity
+heat.tests.autoscaling.test_scaling_group
+heat.tests.autoscaling.test_scaling_policy
+heat.tests.aws.test_instance_network
+heat.tests.aws.test_loadbalancer
+heat.tests.aws.test_network_interface
+heat.tests.aws.test_s3
+heat.tests.aws.test_security_group
+heat.tests.aws.test_user
+heat.tests.aws.test_volume
+heat.tests.barbican.test_order
+heat.tests.barbican.test_secret
+heat.tests.ceilometer.test_ceilometer_alarm
+heat.tests.ceilometer.test_gnocchi_alarm
+heat.tests.cinder.test_cinder_volume_type
+heat.tests.cinder.test_volume
+heat.tests.cinder.test_volume_type_encryption
+heat.tests.clients.test_barbican_client
+heat.tests.clients.test_cinder_client
+heat.tests.clients.test_glance_client
+heat.tests.clients.test_keystone_client
+heat.tests.clients.test_magnum_client
+heat.tests.clients.test_manila_client
+heat.tests.clients.test_mistral_client
+heat.tests.clients.test_neutron_client
+heat.tests.clients.test_sahara_client
+heat.tests.clients.test_zaqar_client
+heat.tests.db.test_sqlalchemy_filters
+heat.tests.db.test_sqlalchemy_types
+heat.tests.db.test_utils
+heat.tests.engine.test_service_engine
+heat.tests.engine.test_stack_action
+heat.tests.engine.test_stack_create
+heat.tests.engine.test_stack_delete
+heat.tests.engine.test_stack_events
+heat.tests.engine.test_stack_snapshot
+heat.tests.engine.test_threadgroup_mgr
+heat.tests.keystone.test_endpoint
+heat.tests.keystone.test_group
+heat.tests.keystone.test_project
+heat.tests.keystone.test_role
+heat.tests.keystone.test_role_assignments
+heat.tests.keystone.test_service
+heat.tests.keystone.test_user
+heat.tests.manila.test_manila_security_service
+heat.tests.manila.test_manila_share
+heat.tests.manila.test_manila_share_type
+heat.tests.manila.test_share_network
+heat.tests.mistral.test_mistral_cron_trigger
+heat.tests.neutron.test_extraroute
+heat.tests.neutron.test_neutron_firewall
+heat.tests.neutron.test_neutron_metering
+heat.tests.neutron.test_neutron_net
+heat.tests.neutron.test_neutron_network_gateway
+heat.tests.neutron.test_neutron_provider_net
+heat.tests.neutron.test_neutron_router
+heat.tests.neutron.test_neutron_security_group
+heat.tests.neutron.test_neutron_subnet
+heat.tests.neutron.test_neutron_vpnservice
+heat.tests.nova.test_nova_flavor
+heat.tests.nova.test_nova_floatingip
+heat.tests.nova.test_nova_keypair
+heat.tests.nova.test_nova_servergroup
+heat.tests.test_attributes
+heat.tests.test_cloud_config
+heat.tests.test_cloudwatch
+heat.tests.test_common_context
+heat.tests.test_common_param_utils
+heat.tests.test_common_policy
+heat.tests.test_common_service_utils
+heat.tests.test_constraints
+heat.tests.test_crypt
+heat.tests.test_cw_alarm
+heat.tests.test_dbinstance
+heat.tests.test_empty_stack
+heat.tests.test_engine_service_stack_watch
+heat.tests.test_environment
+heat.tests.test_environment_format
+heat.tests.test_event
+heat.tests.test_exception
+heat.tests.test_function
+heat.tests.test_glance_image
+heat.tests.test_grouputils
+heat.tests.test_identifier
+heat.tests.test_instance_group
+heat.tests.test_instance_group_update_policy
+heat.tests.test_iso_8601
+heat.tests.test_lifecycle_plugin_utils
+heat.tests.test_magnum_baymodel
+heat.tests.test_metadata_refresh
+heat.tests.test_multi_part
+heat.tests.test_nested_stack
+heat.tests.test_nokey
+heat.tests.test_notifications
+heat.tests.test_plugin_loader
+heat.tests.test_plugin_manager
+heat.tests.test_properties
+heat.tests.test_provider_template
+heat.tests.test_random_string
+heat.tests.test_remote_stack
+heat.tests.test_restarter
+heat.tests.test_rpc_client
+heat.tests.test_rpc_listener_client
+heat.tests.test_rpc_worker_client
+heat.tests.test_rsrc_defn
+heat.tests.test_sahara_cluster
+heat.tests.test_scaling_template
+heat.tests.test_server_tags
 heat.tests.test_short_id
+heat.tests.test_software_component
+heat.tests.test_software_config
 heat.tests.test_stack
+heat.tests.test_stack_collect_attributes
+heat.tests.test_stack_delete
+heat.tests.test_stack_lock
+heat.tests.test_stack_resource
+heat.tests.test_stack_update
+heat.tests.test_stack_user
+heat.tests.test_structured_config
+heat.tests.test_support
+heat.tests.test_swift
+heat.tests.test_swiftsignal
+heat.tests.test_sync_point
+heat.tests.test_timeutils
+heat.tests.test_trove_cluster
+heat.tests.test_urlfetch
+heat.tests.test_version
+heat.tests.test_vpc
+heat.tests.test_watch
+heat.tests.test_zaqar_queue