diff --git a/setup.cfg b/setup.cfg
index a701572..f4aa3e1 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -17,6 +17,10 @@
     Programming Language :: Python :: 2
     Programming Language :: Python :: 2.7
 
+[entry_points]
+console_scripts =
+    verify-tempest-config = tempest.cmd.verify_tempest_config:main
+
 [build_sphinx]
 all_files = 1
 build-dir = doc/build
diff --git a/tempest/cmd/__init__.py b/tempest/cmd/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/tempest/cmd/__init__.py
diff --git a/tools/verify_tempest_config.py b/tempest/cmd/verify_tempest_config.py
similarity index 99%
rename from tools/verify_tempest_config.py
rename to tempest/cmd/verify_tempest_config.py
index 14dd0c2..4d74f53 100755
--- a/tools/verify_tempest_config.py
+++ b/tempest/cmd/verify_tempest_config.py
@@ -312,7 +312,7 @@
     return args
 
 
-def main(argv):
+def main():
     print('Running config verification...')
     opts = parse_args()
     update = opts.update
@@ -343,4 +343,4 @@
 
 
 if __name__ == "__main__":
-    main(sys.argv)
+    main()