diff --git a/run_tests.sh b/run_tests.sh
index 1c6199bb..5e0d6318 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -90,7 +90,7 @@ run_tests() {
 run_pylint() {
   echo "Running pylint ..."
   PYLINT_OPTIONS="--rcfile=.pylintrc --output-format=parseable"
-  PYLINT_INCLUDE="ryu bin/ryu-manager bin/ryu-client"
+  PYLINT_INCLUDE="ryu bin/ryu-manager ryu/tests/bin/ryu-client"
   export PYTHONPATH=$PYTHONPATH:.ryu
   PYLINT_LOG=pylint.log
 
diff --git a/bin/ryu-client b/ryu/tests/bin/ryu-client
similarity index 100%
rename from bin/ryu-client
rename to ryu/tests/bin/ryu-client
diff --git a/setup.py b/setup.py
index 0c7436dc..efbb550d 100644
--- a/setup.py
+++ b/setup.py
@@ -59,8 +59,7 @@ setup(name='ryu',
       install_requires=requires,
       license='Apache License 2.0',
       packages=find_packages(),
-      scripts=['bin/ryu-manager',
-               'bin/ryu-client'],
+      scripts=['bin/ryu-manager', ],
       data_files=data_files,
       include_package_data=True,
       )