diff --git a/pyls/python_ls.py b/pyls/python_ls.py
index da9d8f48..c85fe9eb 100644
--- a/pyls/python_ls.py
+++ b/pyls/python_ls.py
@@ -3,9 +3,9 @@
 import socketserver
 import threading
 
-from jsonrpc.dispatchers import MethodDispatcher
-from jsonrpc.endpoint import Endpoint
-from jsonrpc.streams import JsonRpcStreamReader, JsonRpcStreamWriter
+from pyls_jsonrpc.dispatchers import MethodDispatcher
+from pyls_jsonrpc.endpoint import Endpoint
+from pyls_jsonrpc.streams import JsonRpcStreamReader, JsonRpcStreamWriter
 
 from . import lsp, _utils, uris
 from .config import config
diff --git a/setup.py b/setup.py
index 2d09e9dc..b5eeaa82 100755
--- a/setup.py
+++ b/setup.py
@@ -36,7 +36,7 @@
         'future>=0.14.0',
         'futures; python_version<"3.2"',
         'jedi>=0.12',
-        'python-jsonrpc-server',
+        'python-jsonrpc-server>=0.1.0',
         'pluggy'
     ],
 
diff --git a/test/test_language_server.py b/test/test_language_server.py
index 41b76152..3a4b18d9 100644
--- a/test/test_language_server.py
+++ b/test/test_language_server.py
@@ -2,7 +2,7 @@
 import os
 from threading import Thread
 
-from jsonrpc.exceptions import JsonRpcMethodNotFound
+from pyls_jsonrpc.exceptions import JsonRpcMethodNotFound
 import pytest
 
 from pyls.python_ls import start_io_lang_server, PythonLanguageServer