diff --git a/contrib/fuel_bootstrap/fuel_bootstrap_cli/fuel_bootstrap/tests/__init__.py b/contrib/fuel_bootstrap/fuel_bootstrap_cli/fuel_bootstrap/tests/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/contrib/fuel_bootstrap/fuel_bootstrap_cli/fuel_bootstrap/tests/test_requirements.py b/contrib/fuel_bootstrap/fuel_bootstrap_cli/fuel_bootstrap/tests/test_requirements.py
new file mode 100644
index 00000000..c51891bb
--- /dev/null
+++ b/contrib/fuel_bootstrap/fuel_bootstrap_cli/fuel_bootstrap/tests/test_requirements.py
@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+
+#    Copyright 2015 Mirantis, Inc.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+from pkg_resources import require
+
+
+def test_check_requirements_conflicts():
+    require('fuel-bootstrap')
diff --git a/contrib/fuel_bootstrap/fuel_bootstrap_cli/requirements.txt b/contrib/fuel_bootstrap/fuel_bootstrap_cli/requirements.txt
index af2057bd..afcb3c8d 100644
--- a/contrib/fuel_bootstrap/fuel_bootstrap_cli/requirements.txt
+++ b/contrib/fuel_bootstrap/fuel_bootstrap_cli/requirements.txt
@@ -1,6 +1,10 @@
 PyYAML>=3.1.0
 stevedore
 pbr>=0.6
-cliff>=1.7.0
 six>=1.7.0
+cliff>=1.7.0
 python-fuelclient
+
+## fuel-bootstrap requires fuel-agent as well, but fuel-agent
+## is not installable via pip
+# fuel-agent
diff --git a/tox.ini b/tox.ini
index b14a3f49..18d32fb5 100644
--- a/tox.ini
+++ b/tox.ini
@@ -10,8 +10,10 @@ setenv = VIRTUAL_ENV={envdir}
 passenv = http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY
 deps = -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
+       -e{toxinidir}/contrib/fuel_bootstrap/fuel_bootstrap_cli/
 commands =
   py.test -vv {posargs:fuel_agent/tests}
+  py.test -vv {posargs:contrib/fuel_bootstrap/fuel_bootstrap_cli/fuel_bootstrap/tests}
 
 [testenv:pep8]
 deps = hacking==0.10.2