diff --git a/pkgs/development/python-modules/pyalgotrade/default.nix b/pkgs/development/python-modules/pyalgotrade/default.nix
index 1d4564e9f17..7602caf24cf 100644
--- a/pkgs/development/python-modules/pyalgotrade/default.nix
+++ b/pkgs/development/python-modules/pyalgotrade/default.nix
@@ -1,23 +1,36 @@
 { stdenv
 , buildPythonPackage
 , fetchPypi
-, isPy3k
+, matplotlib
 , numpy
-, scipy
+, python-dateutil
 , pytz
+, requests
+, retrying
+, scipy
+, six
+, tornado
+, tweepy
+, ws4py
 }:
 
 buildPythonPackage rec {
   pname = "pyalgotrade";
   version = "0.20";
-  disabled = isPy3k;
 
   src = fetchPypi {
-    inherit pname version;
+    pname = "PyAlgoTrade";
+    inherit version;
     sha256 = "7927c87af202869155280a93ff6ee934bb5b46cdb1f20b70f7407337f8541cbd";
   };
 
-  propagatedBuildInputs = [ numpy scipy pytz ];
+  propagatedBuildInputs = [
+    matplotlib numpy python-dateutil pytz requests
+    retrying scipy six tornado tweepy ws4py
+  ];
+
+  # no tests in PyPI tarball
+  doCheck = false;
 
   meta = with stdenv.lib; {
     description = "Python Algorithmic Trading";
diff --git a/pkgs/development/python-modules/ws4py/default.nix b/pkgs/development/python-modules/ws4py/default.nix
index 3d81fe532ab..60f0f3cc969 100644
--- a/pkgs/development/python-modules/ws4py/default.nix
+++ b/pkgs/development/python-modules/ws4py/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, pytest, mock, git, asyncio
+{ stdenv, buildPythonPackage, fetchPypi, pytest, mock, git
 , cherrypy, gevent, tornado }:
 
 buildPythonPackage rec {
@@ -11,15 +11,16 @@ buildPythonPackage rec {
   };
 
   checkInputs = [ pytest mock git ];
-  propagatedBuildInputs = [ asyncio cherrypy gevent tornado ];
+  propagatedBuildInputs = [ cherrypy gevent tornado ];
 
   checkPhase = ''
-    pytest -k 'not test_timeout_when_no_registered_fds and not test_mainloop_can_be_stopped_when_no_websocket_were_registered'
+    pytest
   '';
 
   meta = with stdenv.lib; {
     homepage = https://ws4py.readthedocs.org;
     description = "A WebSocket package for Python";
     maintainers = with maintainers; [ rickynils ];
+    license = licenses.bsd3;
   };
 }