diff --git a/.travis.yml b/.travis.yml
index 4bd1110..4d7ff63 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,8 +25,13 @@ install:
   - pip install flask
   - pip install flask_classful
   - pip install pytest-flask
+  - pip install pytest-runner
+  - pip install coveralls
   - python setup.py -q install
 
 script:
   - jdk_switcher use oraclejdk8
-  - py.test
\ No newline at end of file
+  - coverage run --source=grest setup.py test
+
+after_success:
+  coveralls
\ No newline at end of file
diff --git a/README.md b/README.md
index 0530599..9635fe9 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,9 @@
 Build REST APIs with Neo4j and Flask, as quickly as possible!
 
 [![PyPI version](https://badge.fury.io/py/pygrest.svg)](https://badge.fury.io/py/pygrest)
-[![GPL Licence](https://badges.frapsoft.com/os/gpl/gpl.svg?v=103)](https://opensource.org/licenses/GPL-3.0/)
+[![GitHub license](https://img.shields.io/badge/license-GPLv3-blue.svg)](https://raw.githubusercontent.com/mostafa/grest/master/LICENSE)
+[![Travis](https://img.shields.io/travis/rust-lang/rust.svg)](https://github.com/mostafa/grest)
+[![Coveralls](https://img.shields.io/coveralls/jekyll/jekyll.svg)](https://github.com/mostafa/grest)
 [![Join the chat at https://gitter.im/pygrest/Lobby](https://badges.gitter.im/pygrest/Lobby.svg)](https://gitter.im/pygrest/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 gREST (Graph-based REST API Framework) is a RESTful API development framework on top of Python, Flask, Neo4j and Neomodel. Its primary purpose is to ease development of RESTful APIs with little effort and miminum amount of code.
diff --git a/setup.py b/setup.py
index 050b31f..befd11f 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,8 @@
 
 # Reading package version (the same way the sqlalchemy does)
 with open(join(dirname(__file__), 'grest', '__init__.py')) as v_file:
-    package_version = re.compile(r".*__version__ = '(.*?)'", re.S).match(v_file.read()).group(1)
+  package_version = re.compile(
+      r".*__version__ = '(.*?)'", re.S).match(v_file.read()).group(1)
 
 
 setup(name="pygrest",
@@ -37,13 +38,15 @@
           "requests"
       ],
       classifiers=[
-        "Development Status :: 4 - Beta",
-        "Intended Audience :: Developers",
-        "Framework :: Flask",
-        "Topic :: Software Development :: Libraries",
-        "License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
-        "Programming Language :: Python :: 2",
-        "Programming Language :: Python :: 2.7"
+          "Development Status :: 4 - Beta",
+          "Intended Audience :: Developers",
+          "Framework :: Flask",
+          "Topic :: Software Development :: Libraries",
+          "License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
+          "Programming Language :: Python :: 2",
+          "Programming Language :: Python :: 2.7"
       ],
       # keywords='',
+      setup_requires=['pytest-runner'],
+      tests_require=['pytest', 'pytest-flask'],
       zip_safe=False)