diff --git a/pywafo/src/wafo/stats/tests/test_continuous_extra.py b/pywafo/src/wafo/stats/tests/test_continuous_extra.py
deleted file mode 100644
index 77c662f..0000000
--- a/pywafo/src/wafo/stats/tests/test_continuous_extra.py
+++ /dev/null
@@ -1,102 +0,0 @@
-# contains additional tests for continuous distributions
-#
-# NOTE: one test, _est_cont_skip, that is renamed so that nose doesn't
-#       run it,
-#       6 distributions return nan for entropy
-#       truncnorm fails by design for private method _ppf test
-from __future__ import division, print_function, absolute_import
-
-
-import numpy.testing as npt
-import numpy as np
-
-from wafo import stats
-
-from test_continuous_basic import distcont
-
-DECIMAL = 5
-
-@npt.dec.slow
-def test_cont_extra():
-    for distname, arg in distcont[:]:
-        distfn = getattr(stats, distname)
-
-        yield check_ppf_limits, distfn, arg, distname + \
-              ' ppf limit test'
-        yield check_isf_limits, distfn, arg, distname + \
-              ' isf limit test'
-        yield check_loc_scale, distfn, arg, distname + \
-              ' loc, scale test'
-
-@npt.dec.slow
-def _est_cont_skip():
-    for distname, arg in distcont:
-        distfn = getattr(stats, distname)
-        #entropy test checks only for isnan, currently 6 isnan left
-        yield check_entropy, distfn, arg, distname + \
-              ' entropy nan test'
-        # _ppf test has 1 failure be design
-        yield check_ppf_private, distfn, arg, distname + \
-              ' _ppf private test'
-
-def test_540_567():
-    # test for nan returned in tickets 540, 567
-    npt.assert_almost_equal(stats.norm.cdf(-1.7624320982),0.03899815971089126,
-                            decimal=10, err_msg = 'test_540_567')
-    npt.assert_almost_equal(stats.norm.cdf(-1.7624320983),0.038998159702449846,
-                            decimal=10, err_msg = 'test_540_567')
-    npt.assert_almost_equal(stats.norm.cdf(1.38629436112, loc=0.950273420309,
-                            scale=0.204423758009),0.98353464004309321,
-                            decimal=10, err_msg = 'test_540_567')
-
-
-def check_ppf_limits(distfn,arg,msg):
-    below,low,upp,above = distfn.ppf([-1,0,1,2], *arg)
-    #print distfn.name, distfn.a, low, distfn.b, upp
-    #print distfn.name,below,low,upp,above
-    assert_equal_inf_nan(distfn.a,low, msg + 'ppf lower bound')
-    assert_equal_inf_nan(distfn.b,upp, msg + 'ppf upper bound')
-    npt.assert_(np.isnan(below), msg + 'ppf out of bounds - below')
-    npt.assert_(np.isnan(above), msg + 'ppf out of bounds - above')
-
-def check_ppf_private(distfn,arg,msg):
-    #fails by design for trunk norm self.nb not defined
-    ppfs = distfn._ppf(np.array([0.1,0.5,0.9]), *arg)
-    npt.assert_(not np.any(np.isnan(ppfs)), msg + 'ppf private is nan')
-
-
-def check_isf_limits(distfn,arg,msg):
-    below,low,upp,above = distfn.isf([-1,0,1,2], *arg)
-    #print distfn.name, distfn.a, low, distfn.b, upp
-    #print distfn.name,below,low,upp,above
-    assert_equal_inf_nan(distfn.a,upp, msg + 'isf lower bound')
-    assert_equal_inf_nan(distfn.b,low, msg + 'isf upper bound')
-    npt.assert_(np.isnan(below), msg + 'isf out of bounds - below')
-    npt.assert_(np.isnan(above), msg + 'isf out of bounds - above')
-
-
-def check_loc_scale(distfn,arg,msg):
-    m,v = distfn.stats(*arg)
-    loc, scale = 10.0, 10.0
-    mt,vt = distfn.stats(loc=loc, scale=scale, *arg)
-    assert_equal_inf_nan(m*scale+loc,mt,msg + 'mean')
-    assert_equal_inf_nan(v*scale*scale,vt,msg + 'var')
-
-def check_entropy(distfn,arg,msg):
-    ent = distfn.entropy(*arg)
-    #print 'Entropy =', ent
-    npt.assert_(not np.isnan(ent), msg + 'test Entropy is nan')
-
-def assert_equal_inf_nan(v1,v2,msg):
-    npt.assert_(not np.isnan(v1))
-    if not np.isinf(v1):
-        npt.assert_almost_equal(v1, v2, decimal=DECIMAL, err_msg = msg + \
-                                   ' - finite')
-    else:
-        npt.assert_(np.isinf(v2) or np.isnan(v2),
-               msg + ' - infinite, v2=%s' % str(v2))
-
-if __name__ == "__main__":
-    import nose
-    #nose.run(argv=['', __file__])
-    nose.runmodule(argv=[__file__,'-s'], exit=False)
diff --git a/pywafo/src/wafo/stats/tests/test_estimation.py b/pywafo/src/wafo/stats/tests/test_estimation.py
deleted file mode 100644
index e609532..0000000
--- a/pywafo/src/wafo/stats/tests/test_estimation.py
+++ /dev/null
@@ -1,48 +0,0 @@
-# -*- coding:utf-8 -*-
-"""
-Created on 19. nov. 2010
-
-@author: pab
-"""
-from numpy import array, log
-import wafo.stats as ws
-from wafo.stats.estimation import FitDistribution, Profile
-def test_profile():
-    '''
-    # MLE 
-    import wafo.stats as ws
-    R = ws.weibull_min.rvs(1,size=20)
-    >>> R = array([ 0.08018795,  1.09015299,  2.08591271,  0.51542081,  0.75692042,
-    ...    0.57837017,  0.45419753,  1.1559131 ,  0.26582267,  0.51517273,
-    ...    0.75008492,  0.59404957,  1.33748264,  0.14472142,  0.77459603,
-    ...    1.77312556,  1.06347991,  0.42007769,  0.71094628,  0.02366977])
-    
-    >>> phat = FitDistribution(ws.weibull_min, R, 1, scale=1, floc=0.0)
-    >>> phat.par
-    array([ 1.37836487,  0.        ,  0.82085633])
-    
-    # Better CI for phat.par[i=0]
-    >>> Lp = Profile(phat, i=0)
-    >>> Lp.get_bounds(alpha=0.1)
-    array([ 1.00225064,  1.8159036 ])
-    
-    >>> SF = 1./990
-    >>> x = phat.isf(SF)
-    >>> x
-    3.3323076459875312
-    
-    # CI for x
-    >>> Lx = phat.profile(i=0, x=x, link=phat.dist.link)
-    >>> Lx.get_bounds(alpha=0.2)
-    array([ 2.52211661,  4.98664787])
-    
-    # CI for logSF=log(SF)
-    >>> logSF = log(SF)
-    >>> Lsf = phat.profile(i=0, logSF=logSF, link=phat.dist.link, pmin=logSF-10,pmax=logSF+5)
-    >>> Lsf.get_bounds(alpha=0.2)
-    array([-10.87488318,  -4.36225468])
-    '''
-
-if __name__ == '__main__':
-    import doctest
-    doctest.testmod()
\ No newline at end of file