diff --git a/src/main/resources/handlebars/pythonFlaskConnexion/controller_test.mustache b/src/main/resources/handlebars/pythonFlaskConnexion/controller_test.mustache
index 2f3b4c4148..960a28521e 100644
--- a/src/main/resources/handlebars/pythonFlaskConnexion/controller_test.mustache
+++ b/src/main/resources/handlebars/pythonFlaskConnexion/controller_test.mustache
@@ -14,6 +14,8 @@ class {{#operations}}Test{{classname}}(BaseTestCase):
     """{{classname}} integration test stubs"""
 
    {{#operation}}
+   {{#contents}}
+   {{#@first}}
     def test_{{operationId}}(self):
         """Test case for {{{operationId}}}
 
@@ -43,6 +45,8 @@ class {{#operations}}Test{{classname}}(BaseTestCase):
         self.assert200(response,
                        'Response body is : ' + response.data.decode('utf-8'))
 
+   {{/@first}}
+   {{/contents}}
    {{/operation}}
 {{/operations}}
 
diff --git a/src/main/resources/handlebars/pythonFlaskConnexion/requirements.mustache b/src/main/resources/handlebars/pythonFlaskConnexion/requirements.mustache
index fe63fe39d9..235a01920c 100644
--- a/src/main/resources/handlebars/pythonFlaskConnexion/requirements.mustache
+++ b/src/main/resources/handlebars/pythonFlaskConnexion/requirements.mustache
@@ -1,6 +1,8 @@
-connexion == 2.6.0
+connexion >= 2.6.0
+connexion[swagger-ui] >= 2.6.0
 python_dateutil == 2.6.0
 {{#supportPython2}}
 typing == 3.5.2.2
 {{/supportPython2}}
 setuptools >= 21.0.0
+swagger-ui-bundle >= 0.0.2
diff --git a/src/main/resources/handlebars/pythonFlaskConnexion/setup.mustache b/src/main/resources/handlebars/pythonFlaskConnexion/setup.mustache
index 56f8bc1ec1..2ee76bdd08 100644
--- a/src/main/resources/handlebars/pythonFlaskConnexion/setup.mustache
+++ b/src/main/resources/handlebars/pythonFlaskConnexion/setup.mustache
@@ -13,7 +13,10 @@ VERSION = "{{packageVersion}}"
 # prerequisite: setuptools
 # http://pypi.python.org/pypi/setuptools
 
-REQUIRES = ["connexion"]
+REQUIRES = [
+    "connexion",
+    "swagger-ui-bundle>=0.0.2"
+]
 
 setup(
     name=NAME,
diff --git a/src/main/resources/handlebars/pythonFlaskConnexion/tox.mustache b/src/main/resources/handlebars/pythonFlaskConnexion/tox.mustache
index 3efa994317..c85cae3473 100644
--- a/src/main/resources/handlebars/pythonFlaskConnexion/tox.mustache
+++ b/src/main/resources/handlebars/pythonFlaskConnexion/tox.mustache
@@ -1,5 +1,5 @@
 [tox]
-envlist = {{#supportPython2}}py27, {{/supportPython2}}py35
+envlist = {{#supportPython2}}py27, {{/supportPython2}}py38
 
 [testenv]
 deps=-r{toxinidir}/requirements.txt