diff --git a/.travis.yml b/.travis.yml
index 89e8eb77f2e2f52d4607b9d7adf99a22fa49090f..473146545589a1da2d307136220f05e9aa279ff8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,18 +9,16 @@ branches:
 virtualenv:
     system_site_packages: true
 
-before_script:
-    - sudo apt-get update
-    - sudo apt-get -y --force-yes install python-libvirt build-essential python-yaml python-lzma
+before_install:
+    - sudo apt-get -y --force-yes install python-libvirt python-lzma python-yaml
 
 install:
-    - pip install sphinx tox pylint autopep8 flexmock
-    - pip install inspektor
-    - pip install -r requirements.txt
+    - pip install -r requirements-travis.txt
 
 script:
     - inspekt lint
+    - inspekt indent
     - inspekt style
-    - ./selftests/run -v selftests/all/doc
-    - ./selftests/run -v selftests/all/functional
-    - ./selftests/run -v selftests/all/unit
+    - ./selftests/run selftests/all/doc
+    - ./selftests/run selftests/all/functional
+    - ./selftests/run selftests/all/unit
diff --git a/requirements-selftests.txt b/requirements-selftests.txt
new file mode 100644
index 0000000000000000000000000000000000000000..d2574062b99b15360382bca961c20c969aef1f8c
--- /dev/null
+++ b/requirements-selftests.txt
@@ -0,0 +1,9 @@
+# Avocado test requirements
+# nose (selftests)
+nose>=1.3.0
+# sphinx (doc build test)
+Sphinx>=1.3b1
+# flexmock (some unittests use it)
+flexmock>=0.9.7
+# inspektor (static and style checks)
+inspektor>=0.1.12
diff --git a/requirements-travis.txt b/requirements-travis.txt
new file mode 100644
index 0000000000000000000000000000000000000000..b1447fa911dda7b3cae03fbe37f097be43bb0457
--- /dev/null
+++ b/requirements-travis.txt
@@ -0,0 +1,7 @@
+# All pip installable requirements pinned for Travis CI
+fabric==1.10.0
+nose==1.3.4
+pystache==0.5.4
+Sphinx==1.3b1
+flexmock==0.9.7
+inspektor==0.1.12
diff --git a/requirements.txt b/requirements.txt
index 29549b72e92eb5ae2c0931cb2261353b710e5eca..5ed58973148df6508f831b9d466606ab46bb76c6 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,10 +1,11 @@
-coverage==3.6
-nose==1.3.0
-nosexcover==1.0.8
-tox==1.5.0
-virtualenv==1.9.1
-mysql-python==1.2.3
-requests==1.2.3
-fabric==1.7.0
-pyliblzma==0.5.3
-pystache>0.5.0
+# Avocado functional requirements
+# SSH lib (avocado.utils.remote)
+fabric>=1.7.0
+# multiplexer (avocado.core.tree)
+PyYAML>=3.11
+# vm plugin (avocado.plugins.vm)
+libvirt-python>=1.2.9
+# .tar.xz support (avocado.utils.archive)
+pyliblzma>=0.5.3
+# HTML report plugin (avocado.plugins.htmlresult)
+pystache>=0.5.3