diff --git a/avocado.spec b/avocado.spec
index a45be17c11a18f4e78328252d75634fd95f63438..ec54e77b6cb759e96a2b24e3be9f28e9a907e5ea 100644
--- a/avocado.spec
+++ b/avocado.spec
@@ -7,7 +7,7 @@
 Summary: Avocado Test Framework
 Name: avocado
 Version: 35.0
-Release: 0%{?dist}
+Release: 1%{?dist}
 License: GPLv2
 Group: Development/Tools
 URL: http://avocado-framework.github.io/
@@ -110,10 +110,12 @@ examples of how to write tests on your own.
 
 %files examples
 %{_datadir}/avocado/tests
-%{_datadir}/avocado/simpletests
 %{_datadir}/avocado/wrappers
 
 %changelog
+* Thu May 05 2016 Amador Pahim <apahim@redhat.com> - 35.0-1
+- Removed simpletests directory
+
 * Wed Apr 27 2016 Cleber Rosa <cleber@redhat.com> - 35.0-0
 - New upstream release 35.0 (new versioning scheme)
 
diff --git a/docs/source/GetStartedGuide.rst b/docs/source/GetStartedGuide.rst
index cd32c4735bf7301be3802fc6c40974d6631bfb1f..37a0f3457662f5e0703494cde089c4def2240ba9 100644
--- a/docs/source/GetStartedGuide.rst
+++ b/docs/source/GetStartedGuide.rst
@@ -127,16 +127,19 @@ The output might look like this::
     INSTRUMENTED /usr/share/avocado/tests/trinity.py
     INSTRUMENTED /usr/share/avocado/tests/warntest.py
     INSTRUMENTED /usr/share/avocado/tests/whiteboard.py
+    ...
 
 These Python files are considered by Avocado to contain ``INSTRUMENTED``
 tests.
 
-Let's now list a directory with a bunch of executable shell
-scripts::
+Let's now list only the executable shell scripts::
 
-   $ avocado list /usr/share/avocado/simpletests/
-   SIMPLE /usr/share/avocado/simpletests/failtest.sh
-   SIMPLE /usr/share/avocado/simpletests/passtest.sh
+    $ avocado list | grep ^SIMPLE
+    SIMPLE       /usr/share/avocado/tests/env_variables.sh
+    SIMPLE       /usr/share/avocado/tests/output_check.sh
+    SIMPLE       /usr/share/avocado/tests/simplewarning.sh
+    SIMPLE       /usr/share/avocado/tests/failtest.sh
+    SIMPLE       /usr/share/avocado/tests/passtest.sh
 
 Here, as mentioned before, ``SIMPLE`` means that those files are executables
 treated as simple tests. You can also give the ``--verbose`` or ``-V`` flag to
diff --git a/examples/simpletests/failtest.sh b/examples/tests/failtest.sh
similarity index 100%
rename from examples/simpletests/failtest.sh
rename to examples/tests/failtest.sh
diff --git a/examples/simpletests/passtest.sh b/examples/tests/passtest.sh
similarity index 100%
rename from examples/simpletests/passtest.sh
rename to examples/tests/passtest.sh
diff --git a/setup.py b/setup.py
index 28369507623d11fa6961b04c4e54b5bd618a5b1a..f348e57ef8e742a8fb9582176690be1a237a6363 100755
--- a/setup.py
+++ b/setup.py
@@ -69,6 +69,7 @@ def get_data_files():
     data_files += [(get_dir(['etc', 'avocado', 'scripts', 'job', 'post.d']),
                     ['etc/avocado/scripts/job/post.d/README'])]
     data_files += [(get_tests_dir(), glob.glob('examples/tests/*.py'))]
+    data_files += [(get_tests_dir(), glob.glob('examples/tests/*.sh'))]
     for data_dir in glob.glob('examples/tests/*.data'):
         fmt_str = '%s/*' % data_dir
         for f in glob.glob(fmt_str):
@@ -80,10 +81,6 @@ def get_data_files():
                             ['wrappers']),
                     glob.glob('examples/wrappers/*.sh'))]
 
-    data_files += [(get_dir(['usr', 'share', 'avocado', 'simpletests'],
-                            ['simpletests']),
-                    glob.glob('examples/simpletests/*.sh'))]
-
     data_files.append((get_avocado_libexec_dir(), glob.glob('libexec/*')))
     return data_files