diff --git a/functional/test_template_resource.py b/functional/test_template_resource.py
index 80dcdce..2e929b4 100644
--- a/functional/test_template_resource.py
+++ b/functional/test_template_resource.py
@@ -361,11 +361,7 @@
     def setUp(self):
         super(TemplateResourceUpdateFailedTest, self).setUp()
         self.client = self.orchestration_client
-        if self.conf.keypair_name:
-            self.keypair_name = self.conf.keypair_name
-        else:
-            self.keypair = self.create_keypair()
-            self.keypair_name = self.keypair.id
+        self.assign_keypair()
 
     def test_update_on_failed_create(self):
         # create a stack with "server" dependent on "keypair", but
diff --git a/functional/test_validation.py b/functional/test_validation.py
index 52309cd..2d9669d 100644
--- a/functional/test_validation.py
+++ b/functional/test_validation.py
@@ -29,11 +29,7 @@
         if not self.conf.instance_type:
             raise self.skipException("No instance_type configured to test")
 
-        if self.conf.keypair_name:
-            self.keypair_name = self.conf.keypair_name
-        else:
-            self.keypair = self.create_keypair()
-            self.keypair_name = self.keypair.id
+        self.assign_keypair()
 
     def test_stack_validate_provider_references_parent_resource(self):
         template = '''