diff --git a/avocado.spec b/avocado.spec
index 43dba7800241cdf4f6aa8338d79ff3a62b7776b2..391472b6501e5415564a12b71b8507896e62d389 100644
--- a/avocado.spec
+++ b/avocado.spec
@@ -1,6 +1,6 @@
 Summary: Avocado Test Framework
 Name: avocado
-Version: 0.8.0
+Version: 0.10.0
 Release: 2%{?dist}
 License: GPLv2
 Group: Development/Tools
@@ -42,6 +42,9 @@ The set of example tests that are part of the Avocado framework.
 %{_datadir}/avocado/tests
 
 %changelog
+* Thu Aug  7 2014 Lucas Meneghel Rodrigues <lmr@redhat.com> - 0.10.0-1
+- Bumped version to Avocado 0.10.0
+
 * Wed Jul 30 2014 Cleber Rosa <cleber@redhat.com> - 0.8.0-2
 - Split tests into avocado-tests package
 
diff --git a/avocado/version.py b/avocado/version.py
index 7ba1fbdfc1c0e3b4988f6d66673b1071332f7d7d..372194dd20ae198636d524806cb10f7b20d74302 100755
--- a/avocado/version.py
+++ b/avocado/version.py
@@ -18,7 +18,7 @@ __all__ = ['MAJOR', 'MINOR', 'RELEASE', 'VERSION']
 
 
 MAJOR = 0
-MINOR = 8
+MINOR = 10
 RELEASE = 0
 
 VERSION = "%s.%s.%s" % (MAJOR, MINOR, RELEASE)
diff --git a/setup.cfg b/setup.cfg
index a49c83d35d93894afe1b77a4d18867d059019723..2428e692e34d2c0a1ecdad8521d49d581df2e96c 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,6 +1,6 @@
 [metadata]
 name = avocado
-version = 0.8.0
+version = 0.10.0
 summary = Avocado Test Framework
 description-file =
     README.rst
diff --git a/setup.py b/setup.py
index 039208ae18a55cb1df9921a4231c422aed4a543c..a7f7f7253eff889395209ac395d96f593c8b3537 100755
--- a/setup.py
+++ b/setup.py
@@ -31,35 +31,6 @@ setup(name='avocado',
                 'avocado.utils',
                 'avocado.plugins'],
       data_files=[('/etc/avocado', ['etc/settings.ini']),
-                  ('/usr/share/avocado/tests/doublefail', ['tests/doublefail/doublefail.py']),
-
-                  ('/usr/share/avocado/tests/doublefree', ['tests/doublefree/doublefree.py']),
-                  ('/usr/share/avocado/tests/doublefree/data', ['tests/doublefree/data/doublefree.c']),
-
-                  ('/usr/share/avocado/tests/errortest', ['tests/errortest/errortest.py']),
-                  ('/usr/share/avocado/tests/failtest', ['tests/failtest/failtest.py']),
-
-                  ('/usr/share/avocado/tests/fiotest', ['tests/fiotest/fiotest.py']),
-                  ('/usr/share/avocado/tests/fiotest/data', glob.glob('tests/fiotest/data/*')),
-
-                  ('/usr/share/avocado/tests/gendata', ['tests/gendata/gendata.py']),
-
-                  ('/usr/share/avocado/tests/linuxbuild', ['tests/linuxbuild/linuxbuild.py']),
-                  ('/usr/share/avocado/tests/linuxbuild/data', glob.glob('tests/linuxbuild/data/*')),
-
-                  ('/usr/share/avocado/tests/multiplextest', glob.glob('tests/multiplextest/*')),
-                  ('/usr/share/avocado/tests/skiptest', ['tests/skiptest/skiptest.py']),
-                  ('/usr/share/avocado/tests/sleeptenmin', ['tests/sleeptenmin/sleeptenmin.py']),
-                  ('/usr/share/avocado/tests/sleeptest', glob.glob('tests/sleeptest/*')),
-
-                  ('/usr/share/avocado/tests/synctest', glob.glob('tests/synctest/synctest.py')),
-                  ('/usr/share/avocado/tests/synctest/data', ['tests/synctest/data/synctest.tar.bz2']),
-
-                  ('/usr/share/avocado/tests/timeouttest', ['tests/timeouttest/timeouttest.py']),
-
-                  ('/usr/share/avocado/tests/trinity', ['tests/trinity/trinity.py']),
-                  ('/usr/share/avocado/tests/trinity/data', ['tests/trinity/data/trinity-1.4.tar.bz2']),
-
-                  ('/usr/share/avocado/tests/warntest', ['tests/warntest/warntest.py']),
-                  ('/usr/share/avocado/tests/whiteboard', glob.glob('tests/whiteboard/*'))],
+                  ('/usr/share/avocado/tests/',
+                   glob.glob('tests/*/*'))],
       scripts=['scripts/avocado'])