diff --git a/buildspec_merge.yaml b/buildspec_merge.yaml
new file mode 100644
index 0000000000..3edb7742bf
--- /dev/null
+++ b/buildspec_merge.yaml
@@ -0,0 +1,6 @@
+version: 0.2
+phases:
+  build:
+    commands:
+      - docker run -i --rm -v "${PWD}:/cfnlint" -w /cfnlint python:2.7-alpine3.7 sh -c "pip install tox;tox -e py27"
+      - docker run -i --rm -v "${PWD}:/cfnlint" -w /cfnlint python:3.6-alpine3.7 sh -c "pip install tox;tox -e py36,pylint"
diff --git a/setup.py b/setup.py
index a971c344e5..42622d470d 100644
--- a/setup.py
+++ b/setup.py
@@ -41,7 +41,7 @@
     ]},
     packages=find_packages('src'),
     zip_safe=False,
-    install_requires=['pyyaml', 'six'],
+    install_requires=['pyyaml', 'six', 'requests'],
     entry_points={
         'console_scripts': [
             'cfn-lint = cfnlint.__main__:main'
diff --git a/src/cfnlint/helpers.py b/src/cfnlint/helpers.py
index 8c5f485f54..7d3edd374c 100644
--- a/src/cfnlint/helpers.py
+++ b/src/cfnlint/helpers.py
@@ -20,8 +20,8 @@
 import glob
 import imp
 import logging
-import requests
 import pkg_resources
+import requests
 
 LOGGER = logging.getLogger(__name__)
 
diff --git a/test/templates/quickstart/openshift.yaml b/test/templates/quickstart/openshift.yaml
index 51030c520a..a864014768 100644
--- a/test/templates/quickstart/openshift.yaml
+++ b/test/templates/quickstart/openshift.yaml
@@ -795,7 +795,6 @@ Resources:
       StackId:
         Ref: AWS::StackId
     Type: Custom::GenerateKeys
-    Version: '1.0'
   KeyGen:
     Properties:
       Code:
diff --git a/tox.ini b/tox.ini
index 33d45c46a8..f6280289cf 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,10 +4,14 @@ envlist = py27,py36,pylint
 [testenv]
 changedir = test
 commands = discover
-deps = discover
+deps =
+  discover
+  requests
 
 [testenv:pylint]
 changedir =
-basepython=python3.6
-deps=pylint
+basepython = python3.6
+deps =
+  pylint
+  requests
 commands=pylint src/cfnlint