diff --git a/aws-sam-translator-1.11.0.tar.gz b/aws-sam-translator-1.11.0.tar.gz
deleted file mode 100644
index b9a18bf..0000000
--- a/aws-sam-translator-1.11.0.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:db872c43bdfbbae9fc8c9201e6a7aeb9a661cda116a94708ab0577b46a38b962
-size 96492
diff --git a/python-aws-sam-translator.changes b/python-aws-sam-translator.changes
index 090822c..f1a8054 100644
--- a/python-aws-sam-translator.changes
+++ b/python-aws-sam-translator.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Wed Jun  5 18:12:58 UTC 2019 - Todd R <toddrme2178@gmail.com>
+
+- Switch to github sources which include tests
+- Enable tests
+- Fix dependencies
+- Add commandline tool
+
 -------------------------------------------------------------------
 Fri May 17 20:27:10 UTC 2019 - Scott Wulf <swulf@suse.com>
 
diff --git a/python-aws-sam-translator.spec b/python-aws-sam-translator.spec
index 0edf81a..d85cb74 100644
--- a/python-aws-sam-translator.spec
+++ b/python-aws-sam-translator.spec
@@ -24,41 +24,33 @@ Summary:        AWS SAM template to AWS CloudFormation template translator
 License:        Apache-2.0
 Group:          Development/Languages/Python
 Url:            https://github.com/awslabs/serverless-application-model
-Source:         https://files.pythonhosted.org/packages/source/a/aws-sam-translator/aws-sam-translator-%{version}.tar.gz
+Source:         https://github.com/awslabs/serverless-application-model/archive/v%{version}.tar.gz#/serverless-application-model-%{version}.tar.gz
 Patch:          ast_drop-compatible-releases-operator.patch
-BuildRequires:  %{python_module devel}
 BuildRequires:  %{python_module setuptools}
+BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros
 # SECTION test requirements
-BuildRequires:  %{python_module boto3 < 2.0}
+BuildRequires:  %{python_module PyYAML >= 4.2}
 BuildRequires:  %{python_module boto3 >= 1.5}
-BuildRequires:  %{python_module jsonschema < 3.0}
+BuildRequires:  %{python_module coverage >= 4.4.0}
 BuildRequires:  %{python_module jsonschema >= 2.6}
-BuildRequires:  %{python_module six < 2.0}
+BuildRequires:  %{python_module mock >= 2.0.0}
+BuildRequires:  %{python_module parameterized >= 0.6.1}
+BuildRequires:  %{python_module pytest >= 3.0.7}
+BuildRequires:  %{python_module pytest-cov >= 2.4.0}
+BuildRequires:  %{python_module py >= 1.4.33}
+BuildRequires:  %{python_module requests >= 2.20.0}
 BuildRequires:  %{python_module six >= 1.11}
+BuildRequires:  python-enum34 >= 1.1
 # /SECTION
-BuildRequires:  fdupes
-Requires:       python-boto3 < 2.0
+Requires:       python-PyYAML >= 4.2
 Requires:       python-boto3 >= 1.5
-Requires:       python-jsonschema < 3.0
+Requires:       python-docopt >= 0.6.2
 Requires:       python-jsonschema >= 2.6
-Requires:       python-six < 2.0
 Requires:       python-six >= 1.11
-Suggests:       python-enum34 >= 1.1
-Suggests:       python-enum34 < 2.0
-Suggests:       python-coverage >= 4.4.0
-Suggests:       python-flake8 >= 3.3.0
-Suggests:       python-tox >= 2.2.1
-Suggests:       python-pytest-cov >= 2.4.0
-Suggests:       python-pylint >= 1.7.2
-Suggests:       python-PyYAML == 3.12
-Suggests:       python-pytest >= 3.0.7
-Suggests:       python-py >= 1.4.33
-Suggests:       python-mock >= 2.0.0
-Suggests:       python-nose >= 1.3.7
-Suggests:       python-parameterized >= 0.6.1
-Suggests:       python-requests >= 2.11.1
-Suggests:       python-docopt >= 0.6.2
+%ifpython2
+Requires:       python-enum34 >= 1.1
+%endif
 BuildArch:      noarch
 
 %python_subpackages
@@ -68,8 +60,9 @@ AWS SAM Translator is a library that transform SAM
 templates into AWS CloudFormation templates
 
 %prep
-%setup -q -n aws-sam-translator-%{version}
+%setup -q -n serverless-application-model-%{version}
 %patch -p1
+sed -i -e '1s|#!/usr/bin/env python2|#!/usr/bin/python3|' bin/sam-translate.py
 
 %build
 %python_build
@@ -78,9 +71,16 @@ templates into AWS CloudFormation templates
 %python_install
 %python_expand %fdupes %{buildroot}%{$python_sitelib}
 
+mkdir -p %{buildroot}%{_bindir}
+install -D -m 644 bin/sam-translate.py %{buildroot}%{_bindir}/sam-translate
+
+%check
+%pytest
+
 %files %{python_files}
 %doc README.md
 %license LICENSE
+%python3_only %{_bindir}/sam-translate
 %{python_sitelib}/*
 
 %changelog
diff --git a/serverless-application-model-1.11.0.tar.gz b/serverless-application-model-1.11.0.tar.gz
new file mode 100644
index 0000000..66f5784
--- /dev/null
+++ b/serverless-application-model-1.11.0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2bf620d1d22ee28781eefe0cb47e121c3f40eab4b04635889936b0ec1847e4f2
+size 5090907