diff --git a/0.4.1.tar.gz b/0.4.1.tar.gz
new file mode 100644
index 0000000..cee2139
--- /dev/null
+++ b/0.4.1.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:280a980330e6e83010bb29225091b4094d594a83f174142c5657beda7edf3300
+size 51409
diff --git a/python-textfsm.changes b/python-textfsm.changes
index 8266ba9..1e7356d 100644
--- a/python-textfsm.changes
+++ b/python-textfsm.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Jun 21 07:33:03 UTC 2018 - tchvatal@suse.com
+
+- Add dependency over python-six as it is stated by upstream
+- Switch to github archive as it contains the testdata
+
 -------------------------------------------------------------------
 Wed Jun 20 21:02:45 UTC 2018 - gyee@suse.com
 
diff --git a/python-textfsm.spec b/python-textfsm.spec
index 556c6b9..6660d52 100644
--- a/python-textfsm.spec
+++ b/python-textfsm.spec
@@ -13,19 +13,22 @@
 # published by the Open Source Initiative.
 
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
+#
 
 
 %{?!python_module:%define python_module() python-%{**} python3-%{**}}
 Name:           python-textfsm
 Version:        0.4.1
 Release:        0
-License:        Apache-2.0
 Summary:        Python module for parsing semi-structured text into python tables
-Url:            https://github.com/google/textfsm
+License:        Apache-2.0
 Group:          Development/Languages/Python
-Source:         https://files.pythonhosted.org/packages/source/t/textfsm/textfsm-%{version}.tar.gz
-BuildRequires:  python-rpm-macros
+Url:            https://github.com/google/textfsm
+Source:         https://github.com/google/textfsm/archive/0.4.1.tar.gz
 BuildRequires:  %{python_module setuptools}
+BuildRequires:  %{python_module six}
+BuildRequires:  python-rpm-macros
+Requires:       python-six
 BuildRequires:  fdupes
 BuildArch:      noarch
 
@@ -47,6 +50,14 @@ devices.
 %python_install
 %python_expand %fdupes %{buildroot}%{$python_sitelib}
 
+%check
+%python_exec clitable_test.py
+%python_exec copyable_regex_object_test.py
+%python_exec terminal_test.py
+# textfsm_test.py is not working under python2
+python3 textfsm_test.py
+%python_exec texttable_test.py
+
 %files %{python_files}
 %license COPYING
 %doc README.md
diff --git a/textfsm-0.4.1.tar.gz b/textfsm-0.4.1.tar.gz
deleted file mode 100644
index e726848..0000000
--- a/textfsm-0.4.1.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:21a31e212d625d84a8c7a52f35055d536bd3a1c63d3d41ed65ee5d8bd5f29f00
-size 38369