From bed9c020b5017b627a038d3acc3b1ca195420b5f Mon Sep 17 00:00:00 2001
From: Philipp Rudiger <prudiger@anaconda.com>
Date: Tue, 25 May 2021 22:56:21 +0200
Subject: [PATCH] Switch to pytest

---
 ...{testarrayinterface.py => test_arrayinterface.py} |  0
 ...{testbinneddatasets.py => test_binneddatasets.py} |  0
 .../{testcudfinterface.py => test_cudfinterface.py}  |  0
 .../{testdaskinterface.py => test_daskinterface.py}  |  2 +-
 .../{testdictinterface.py => test_dictinterface.py}  |  0
 .../{testgridinterface.py => test_gridinterface.py}  |  2 +-
 .../{testibisinterface.py => test_ibisinterface.py}  |  0
 ...{testimageinterface.py => test_imageinterface.py} |  0
 ...{testmultiinterface.py => test_multiinterface.py} |  0
 ...estpandasinterface.py => test_pandasinterface.py} |  0
 .../{testspatialpandas.py => test_spatialpandas.py}  |  2 +-
 ...estxarrayinterface.py => test_xarrayinterface.py} |  4 ++--
 holoviews/tests/core/{testapply.py => test_apply.py} |  0
 .../tests/core/{testarchives.py => test_archives.py} |  0
 ...{testboundingregion.py => test_boundingregion.py} |  0
 .../tests/core/{testcallable.py => test_callable.py} |  0
 .../core/{testcollation.py => test_collation.py}     |  0
 .../core/{testcomposites.py => test_composites.py}   |  0
 ...estdatasetproperty.py => test_datasetproperty.py} |  0
 .../core/{testdecollation.py => test_decollation.py} |  0
 .../core/{testdimensioned.py => test_dimensioned.py} |  0
 .../core/{testdimensions.py => test_dimensions.py}   |  0
 .../tests/core/{testdynamic.py => test_dynamic.py}   |  2 +-
 .../tests/core/{testelement.py => test_element.py}   |  0
 .../{testimportexport.py => test_importexport.py}    |  0
 .../tests/core/{testlayers.py => test_layers.py}     |  0
 .../tests/core/{testlayouts.py => test_layouts.py}   |  0
 .../core/{testndmapping.py => test_ndmapping.py}     |  0
 .../core/{testoperation.py => test_operation.py}     |  0
 .../tests/core/{testoptions.py => test_options.py}   |  0
 .../core/{testprettyprint.py => test_prettyprint.py} |  2 +-
 .../{teststoreoptions.py => test_storeoptions.py}    |  0
 .../core/{testtraversal.py => test_traversal.py}     |  0
 holoviews/tests/core/{testtree.py => test_tree.py}   |  0
 holoviews/tests/core/{testutils.py => test_utils.py} |  0
 .../{testannotations.py => test_annotations.py}      |  0
 ...{testapiconsistency.py => test_apiconsistency.py} |  0
 ...estcomparisonchart.py => test_comparisonchart.py} |  0
 ...risoncomposite.py => test_comparisoncomposite.py} |  0
 ...risondimension.py => test_comparisondimension.py} |  0
 ...{testcomparisonpath.py => test_comparisonpath.py} |  0
 ...tcomparisonraster.py => test_comparisonraster.py} |  0
 ...tcomparisonsimple.py => test_comparisonsimple.py} |  0
 ...ntconstructors.py => test_elementconstructors.py} |  0
 .../{testelementranges.py => test_elementranges.py}  |  0
 .../{testelementselect.py => test_elementselect.py}  |  0
 .../element/{testellipsis.py => test_ellipsis.py}    |  0
 .../{testgraphelement.py => test_graphelement.py}    |  0
 .../tests/element/{testimage.py => test_image.py}    |  0
 .../tests/element/{testpaths.py => test_paths.py}    |  0
 .../tests/element/{testraster.py => test_raster.py}  |  0
 .../{teststatselements.py => test_statselements.py}  |  0
 .../tests/element/{testtiles.py => test_tiles.py}    |  0
 .../{testdisplayhooks.py => test_displayhooks.py}    |  0
 .../tests/ipython/{testmagics.py => test_magics.py}  |  0
 .../ipython/{testnotebooks.py => test_notebooks.py}  |  0
 .../{testoptscompleter.py => test_optscompleter.py}  |  0
 .../ipython/{testparsers.py => test_parsers.py}      |  0
 .../{testdatashader.py => test_datashader.py}        |  0
 .../{testoperation.py => test_operation.py}          |  0
 ...eststatsoperations.py => test_statsoperations.py} |  0
 ...iesoperations.py => test_timeseriesoperations.py} |  0
 .../tests/plotting/{testcomms.py => test_comms.py}   |  0
 .../plotting/{testplotutils.py => test_plotutils.py} |  0
 .../{testrenderclass.py => test_renderclass.py}      |  0
 .../tests/{testselection.py => test_selection.py}    |  0
 holoviews/tests/{teststreams.py => test_streams.py}  |  0
 .../util/{testtransform.py => test_transform.py}     |  0
 holoviews/tests/util/{testutils.py => test_utils.py} |  0
 setup.py                                             |  3 ++-
 tox.ini                                              | 12 ++----------
 71 files changed, 11 insertions(+), 18 deletions(-)
 rename holoviews/tests/core/data/{testarrayinterface.py => test_arrayinterface.py} (100%)
 rename holoviews/tests/core/data/{testbinneddatasets.py => test_binneddatasets.py} (100%)
 rename holoviews/tests/core/data/{testcudfinterface.py => test_cudfinterface.py} (100%)
 rename holoviews/tests/core/data/{testdaskinterface.py => test_daskinterface.py} (98%)
 rename holoviews/tests/core/data/{testdictinterface.py => test_dictinterface.py} (100%)
 rename holoviews/tests/core/data/{testgridinterface.py => test_gridinterface.py} (99%)
 rename holoviews/tests/core/data/{testibisinterface.py => test_ibisinterface.py} (100%)
 rename holoviews/tests/core/data/{testimageinterface.py => test_imageinterface.py} (100%)
 rename holoviews/tests/core/data/{testmultiinterface.py => test_multiinterface.py} (100%)
 rename holoviews/tests/core/data/{testpandasinterface.py => test_pandasinterface.py} (100%)
 rename holoviews/tests/core/data/{testspatialpandas.py => test_spatialpandas.py} (99%)
 rename holoviews/tests/core/data/{testxarrayinterface.py => test_xarrayinterface.py} (99%)
 rename holoviews/tests/core/{testapply.py => test_apply.py} (100%)
 rename holoviews/tests/core/{testarchives.py => test_archives.py} (100%)
 rename holoviews/tests/core/{testboundingregion.py => test_boundingregion.py} (100%)
 rename holoviews/tests/core/{testcallable.py => test_callable.py} (100%)
 rename holoviews/tests/core/{testcollation.py => test_collation.py} (100%)
 rename holoviews/tests/core/{testcomposites.py => test_composites.py} (100%)
 rename holoviews/tests/core/{testdatasetproperty.py => test_datasetproperty.py} (100%)
 rename holoviews/tests/core/{testdecollation.py => test_decollation.py} (100%)
 rename holoviews/tests/core/{testdimensioned.py => test_dimensioned.py} (100%)
 rename holoviews/tests/core/{testdimensions.py => test_dimensions.py} (100%)
 rename holoviews/tests/core/{testdynamic.py => test_dynamic.py} (99%)
 rename holoviews/tests/core/{testelement.py => test_element.py} (100%)
 rename holoviews/tests/core/{testimportexport.py => test_importexport.py} (100%)
 rename holoviews/tests/core/{testlayers.py => test_layers.py} (100%)
 rename holoviews/tests/core/{testlayouts.py => test_layouts.py} (100%)
 rename holoviews/tests/core/{testndmapping.py => test_ndmapping.py} (100%)
 rename holoviews/tests/core/{testoperation.py => test_operation.py} (100%)
 rename holoviews/tests/core/{testoptions.py => test_options.py} (100%)
 rename holoviews/tests/core/{testprettyprint.py => test_prettyprint.py} (98%)
 rename holoviews/tests/core/{teststoreoptions.py => test_storeoptions.py} (100%)
 rename holoviews/tests/core/{testtraversal.py => test_traversal.py} (100%)
 rename holoviews/tests/core/{testtree.py => test_tree.py} (100%)
 rename holoviews/tests/core/{testutils.py => test_utils.py} (100%)
 rename holoviews/tests/element/{testannotations.py => test_annotations.py} (100%)
 rename holoviews/tests/element/{testapiconsistency.py => test_apiconsistency.py} (100%)
 rename holoviews/tests/element/{testcomparisonchart.py => test_comparisonchart.py} (100%)
 rename holoviews/tests/element/{testcomparisoncomposite.py => test_comparisoncomposite.py} (100%)
 rename holoviews/tests/element/{testcomparisondimension.py => test_comparisondimension.py} (100%)
 rename holoviews/tests/element/{testcomparisonpath.py => test_comparisonpath.py} (100%)
 rename holoviews/tests/element/{testcomparisonraster.py => test_comparisonraster.py} (100%)
 rename holoviews/tests/element/{testcomparisonsimple.py => test_comparisonsimple.py} (100%)
 rename holoviews/tests/element/{testelementconstructors.py => test_elementconstructors.py} (100%)
 rename holoviews/tests/element/{testelementranges.py => test_elementranges.py} (100%)
 rename holoviews/tests/element/{testelementselect.py => test_elementselect.py} (100%)
 rename holoviews/tests/element/{testellipsis.py => test_ellipsis.py} (100%)
 rename holoviews/tests/element/{testgraphelement.py => test_graphelement.py} (100%)
 rename holoviews/tests/element/{testimage.py => test_image.py} (100%)
 rename holoviews/tests/element/{testpaths.py => test_paths.py} (100%)
 rename holoviews/tests/element/{testraster.py => test_raster.py} (100%)
 rename holoviews/tests/element/{teststatselements.py => test_statselements.py} (100%)
 rename holoviews/tests/element/{testtiles.py => test_tiles.py} (100%)
 rename holoviews/tests/ipython/{testdisplayhooks.py => test_displayhooks.py} (100%)
 rename holoviews/tests/ipython/{testmagics.py => test_magics.py} (100%)
 rename holoviews/tests/ipython/{testnotebooks.py => test_notebooks.py} (100%)
 rename holoviews/tests/ipython/{testoptscompleter.py => test_optscompleter.py} (100%)
 rename holoviews/tests/ipython/{testparsers.py => test_parsers.py} (100%)
 rename holoviews/tests/operation/{testdatashader.py => test_datashader.py} (100%)
 rename holoviews/tests/operation/{testoperation.py => test_operation.py} (100%)
 rename holoviews/tests/operation/{teststatsoperations.py => test_statsoperations.py} (100%)
 rename holoviews/tests/operation/{testtimeseriesoperations.py => test_timeseriesoperations.py} (100%)
 rename holoviews/tests/plotting/{testcomms.py => test_comms.py} (100%)
 rename holoviews/tests/plotting/{testplotutils.py => test_plotutils.py} (100%)
 rename holoviews/tests/plotting/{testrenderclass.py => test_renderclass.py} (100%)
 rename holoviews/tests/{testselection.py => test_selection.py} (100%)
 rename holoviews/tests/{teststreams.py => test_streams.py} (100%)
 rename holoviews/tests/util/{testtransform.py => test_transform.py} (100%)
 rename holoviews/tests/util/{testutils.py => test_utils.py} (100%)

diff --git a/holoviews/tests/core/data/testarrayinterface.py b/holoviews/tests/core/data/test_arrayinterface.py
similarity index 100%
rename from holoviews/tests/core/data/testarrayinterface.py
rename to holoviews/tests/core/data/test_arrayinterface.py
diff --git a/holoviews/tests/core/data/testbinneddatasets.py b/holoviews/tests/core/data/test_binneddatasets.py
similarity index 100%
rename from holoviews/tests/core/data/testbinneddatasets.py
rename to holoviews/tests/core/data/test_binneddatasets.py
diff --git a/holoviews/tests/core/data/testcudfinterface.py b/holoviews/tests/core/data/test_cudfinterface.py
similarity index 100%
rename from holoviews/tests/core/data/testcudfinterface.py
rename to holoviews/tests/core/data/test_cudfinterface.py
diff --git a/holoviews/tests/core/data/testdaskinterface.py b/holoviews/tests/core/data/test_daskinterface.py
similarity index 98%
rename from holoviews/tests/core/data/testdaskinterface.py
rename to holoviews/tests/core/data/test_daskinterface.py
index 5997dc6af6..ea4dd0ec05 100644
--- a/holoviews/tests/core/data/testdaskinterface.py
+++ b/holoviews/tests/core/data/test_daskinterface.py
@@ -11,7 +11,7 @@
 from holoviews.core.data import Dataset
 from holoviews.util.transform import dim
 
-from .testpandasinterface import BasePandasInterfaceTests
+from .test_pandasinterface import BasePandasInterfaceTests
 
 
 class DaskDatasetTest(BasePandasInterfaceTests):
diff --git a/holoviews/tests/core/data/testdictinterface.py b/holoviews/tests/core/data/test_dictinterface.py
similarity index 100%
rename from holoviews/tests/core/data/testdictinterface.py
rename to holoviews/tests/core/data/test_dictinterface.py
diff --git a/holoviews/tests/core/data/testgridinterface.py b/holoviews/tests/core/data/test_gridinterface.py
similarity index 99%
rename from holoviews/tests/core/data/testgridinterface.py
rename to holoviews/tests/core/data/test_gridinterface.py
index d42d270d72..f303819cb9 100644
--- a/holoviews/tests/core/data/testgridinterface.py
+++ b/holoviews/tests/core/data/test_gridinterface.py
@@ -21,7 +21,7 @@
 from .base import (
     GriddedInterfaceTests, InterfaceTests, HomogeneousColumnTests, DatatypeContext
 )
-from .testimageinterface import (
+from .test_imageinterface import (
     BaseImageElementInterfaceTests, BaseRGBElementInterfaceTests,
     BaseHSVElementInterfaceTests
 )
diff --git a/holoviews/tests/core/data/testibisinterface.py b/holoviews/tests/core/data/test_ibisinterface.py
similarity index 100%
rename from holoviews/tests/core/data/testibisinterface.py
rename to holoviews/tests/core/data/test_ibisinterface.py
diff --git a/holoviews/tests/core/data/testimageinterface.py b/holoviews/tests/core/data/test_imageinterface.py
similarity index 100%
rename from holoviews/tests/core/data/testimageinterface.py
rename to holoviews/tests/core/data/test_imageinterface.py
diff --git a/holoviews/tests/core/data/testmultiinterface.py b/holoviews/tests/core/data/test_multiinterface.py
similarity index 100%
rename from holoviews/tests/core/data/testmultiinterface.py
rename to holoviews/tests/core/data/test_multiinterface.py
diff --git a/holoviews/tests/core/data/testpandasinterface.py b/holoviews/tests/core/data/test_pandasinterface.py
similarity index 100%
rename from holoviews/tests/core/data/testpandasinterface.py
rename to holoviews/tests/core/data/test_pandasinterface.py
diff --git a/holoviews/tests/core/data/testspatialpandas.py b/holoviews/tests/core/data/test_spatialpandas.py
similarity index 99%
rename from holoviews/tests/core/data/testspatialpandas.py
rename to holoviews/tests/core/data/test_spatialpandas.py
index b514b010e0..1ce61d94eb 100644
--- a/holoviews/tests/core/data/testspatialpandas.py
+++ b/holoviews/tests/core/data/test_spatialpandas.py
@@ -26,7 +26,7 @@
 from holoviews.element import Path, Points, Polygons
 from holoviews.element.comparison import ComparisonTestCase
 
-from .testmultiinterface import GeomTests
+from .test_multiinterface import GeomTests
 
 
 class RoundTripTests(ComparisonTestCase):
diff --git a/holoviews/tests/core/data/testxarrayinterface.py b/holoviews/tests/core/data/test_xarrayinterface.py
similarity index 99%
rename from holoviews/tests/core/data/testxarrayinterface.py
rename to holoviews/tests/core/data/test_xarrayinterface.py
index 3956893804..c3623d47aa 100644
--- a/holoviews/tests/core/data/testxarrayinterface.py
+++ b/holoviews/tests/core/data/test_xarrayinterface.py
@@ -16,11 +16,11 @@
 from holoviews.core.spaces import HoloMap
 from holoviews.element import Image, RGB, HSV, QuadMesh
 
-from .testimageinterface import (
+from .test_imageinterface import (
     BaseImageElementInterfaceTests, BaseRGBElementInterfaceTests,
     BaseHSVElementInterfaceTests
 )
-from .testgridinterface import BaseGridInterfaceTests
+from .test_gridinterface import BaseGridInterfaceTests
 
 
 class XArrayInterfaceTests(BaseGridInterfaceTests):
diff --git a/holoviews/tests/core/testapply.py b/holoviews/tests/core/test_apply.py
similarity index 100%
rename from holoviews/tests/core/testapply.py
rename to holoviews/tests/core/test_apply.py
diff --git a/holoviews/tests/core/testarchives.py b/holoviews/tests/core/test_archives.py
similarity index 100%
rename from holoviews/tests/core/testarchives.py
rename to holoviews/tests/core/test_archives.py
diff --git a/holoviews/tests/core/testboundingregion.py b/holoviews/tests/core/test_boundingregion.py
similarity index 100%
rename from holoviews/tests/core/testboundingregion.py
rename to holoviews/tests/core/test_boundingregion.py
diff --git a/holoviews/tests/core/testcallable.py b/holoviews/tests/core/test_callable.py
similarity index 100%
rename from holoviews/tests/core/testcallable.py
rename to holoviews/tests/core/test_callable.py
diff --git a/holoviews/tests/core/testcollation.py b/holoviews/tests/core/test_collation.py
similarity index 100%
rename from holoviews/tests/core/testcollation.py
rename to holoviews/tests/core/test_collation.py
diff --git a/holoviews/tests/core/testcomposites.py b/holoviews/tests/core/test_composites.py
similarity index 100%
rename from holoviews/tests/core/testcomposites.py
rename to holoviews/tests/core/test_composites.py
diff --git a/holoviews/tests/core/testdatasetproperty.py b/holoviews/tests/core/test_datasetproperty.py
similarity index 100%
rename from holoviews/tests/core/testdatasetproperty.py
rename to holoviews/tests/core/test_datasetproperty.py
diff --git a/holoviews/tests/core/testdecollation.py b/holoviews/tests/core/test_decollation.py
similarity index 100%
rename from holoviews/tests/core/testdecollation.py
rename to holoviews/tests/core/test_decollation.py
diff --git a/holoviews/tests/core/testdimensioned.py b/holoviews/tests/core/test_dimensioned.py
similarity index 100%
rename from holoviews/tests/core/testdimensioned.py
rename to holoviews/tests/core/test_dimensioned.py
diff --git a/holoviews/tests/core/testdimensions.py b/holoviews/tests/core/test_dimensions.py
similarity index 100%
rename from holoviews/tests/core/testdimensions.py
rename to holoviews/tests/core/test_dimensions.py
diff --git a/holoviews/tests/core/testdynamic.py b/holoviews/tests/core/test_dynamic.py
similarity index 99%
rename from holoviews/tests/core/testdynamic.py
rename to holoviews/tests/core/test_dynamic.py
index ebb26e3575..77fd8c1998 100644
--- a/holoviews/tests/core/testdynamic.py
+++ b/holoviews/tests/core/test_dynamic.py
@@ -17,7 +17,7 @@
 from holoviews.element.comparison import ComparisonTestCase
 
 from ..utils import LoggingComparisonTestCase
-from .testdimensioned import CustomBackendTestCase, TestObj
+from .test_dimensioned import CustomBackendTestCase, TestObj
 
 XY = Stream.define('XY', x=0,y=0)
 X = Stream.define('X', x=0)
diff --git a/holoviews/tests/core/testelement.py b/holoviews/tests/core/test_element.py
similarity index 100%
rename from holoviews/tests/core/testelement.py
rename to holoviews/tests/core/test_element.py
diff --git a/holoviews/tests/core/testimportexport.py b/holoviews/tests/core/test_importexport.py
similarity index 100%
rename from holoviews/tests/core/testimportexport.py
rename to holoviews/tests/core/test_importexport.py
diff --git a/holoviews/tests/core/testlayers.py b/holoviews/tests/core/test_layers.py
similarity index 100%
rename from holoviews/tests/core/testlayers.py
rename to holoviews/tests/core/test_layers.py
diff --git a/holoviews/tests/core/testlayouts.py b/holoviews/tests/core/test_layouts.py
similarity index 100%
rename from holoviews/tests/core/testlayouts.py
rename to holoviews/tests/core/test_layouts.py
diff --git a/holoviews/tests/core/testndmapping.py b/holoviews/tests/core/test_ndmapping.py
similarity index 100%
rename from holoviews/tests/core/testndmapping.py
rename to holoviews/tests/core/test_ndmapping.py
diff --git a/holoviews/tests/core/testoperation.py b/holoviews/tests/core/test_operation.py
similarity index 100%
rename from holoviews/tests/core/testoperation.py
rename to holoviews/tests/core/test_operation.py
diff --git a/holoviews/tests/core/testoptions.py b/holoviews/tests/core/test_options.py
similarity index 100%
rename from holoviews/tests/core/testoptions.py
rename to holoviews/tests/core/test_options.py
diff --git a/holoviews/tests/core/testprettyprint.py b/holoviews/tests/core/test_prettyprint.py
similarity index 98%
rename from holoviews/tests/core/testprettyprint.py
rename to holoviews/tests/core/test_prettyprint.py
index 898f6cbfda..8aa10d395b 100644
--- a/holoviews/tests/core/testprettyprint.py
+++ b/holoviews/tests/core/test_prettyprint.py
@@ -7,7 +7,7 @@
 from holoviews import Store, Element, Curve, Overlay, Layout
 from holoviews.core.pprint import PrettyPrinter
 
-from .testdimensioned import CustomBackendTestCase, TestObj
+from .test_dimensioned import CustomBackendTestCase, TestObj
 
 
 class PrettyPrintTest(ComparisonTestCase):
diff --git a/holoviews/tests/core/teststoreoptions.py b/holoviews/tests/core/test_storeoptions.py
similarity index 100%
rename from holoviews/tests/core/teststoreoptions.py
rename to holoviews/tests/core/test_storeoptions.py
diff --git a/holoviews/tests/core/testtraversal.py b/holoviews/tests/core/test_traversal.py
similarity index 100%
rename from holoviews/tests/core/testtraversal.py
rename to holoviews/tests/core/test_traversal.py
diff --git a/holoviews/tests/core/testtree.py b/holoviews/tests/core/test_tree.py
similarity index 100%
rename from holoviews/tests/core/testtree.py
rename to holoviews/tests/core/test_tree.py
diff --git a/holoviews/tests/core/testutils.py b/holoviews/tests/core/test_utils.py
similarity index 100%
rename from holoviews/tests/core/testutils.py
rename to holoviews/tests/core/test_utils.py
diff --git a/holoviews/tests/element/testannotations.py b/holoviews/tests/element/test_annotations.py
similarity index 100%
rename from holoviews/tests/element/testannotations.py
rename to holoviews/tests/element/test_annotations.py
diff --git a/holoviews/tests/element/testapiconsistency.py b/holoviews/tests/element/test_apiconsistency.py
similarity index 100%
rename from holoviews/tests/element/testapiconsistency.py
rename to holoviews/tests/element/test_apiconsistency.py
diff --git a/holoviews/tests/element/testcomparisonchart.py b/holoviews/tests/element/test_comparisonchart.py
similarity index 100%
rename from holoviews/tests/element/testcomparisonchart.py
rename to holoviews/tests/element/test_comparisonchart.py
diff --git a/holoviews/tests/element/testcomparisoncomposite.py b/holoviews/tests/element/test_comparisoncomposite.py
similarity index 100%
rename from holoviews/tests/element/testcomparisoncomposite.py
rename to holoviews/tests/element/test_comparisoncomposite.py
diff --git a/holoviews/tests/element/testcomparisondimension.py b/holoviews/tests/element/test_comparisondimension.py
similarity index 100%
rename from holoviews/tests/element/testcomparisondimension.py
rename to holoviews/tests/element/test_comparisondimension.py
diff --git a/holoviews/tests/element/testcomparisonpath.py b/holoviews/tests/element/test_comparisonpath.py
similarity index 100%
rename from holoviews/tests/element/testcomparisonpath.py
rename to holoviews/tests/element/test_comparisonpath.py
diff --git a/holoviews/tests/element/testcomparisonraster.py b/holoviews/tests/element/test_comparisonraster.py
similarity index 100%
rename from holoviews/tests/element/testcomparisonraster.py
rename to holoviews/tests/element/test_comparisonraster.py
diff --git a/holoviews/tests/element/testcomparisonsimple.py b/holoviews/tests/element/test_comparisonsimple.py
similarity index 100%
rename from holoviews/tests/element/testcomparisonsimple.py
rename to holoviews/tests/element/test_comparisonsimple.py
diff --git a/holoviews/tests/element/testelementconstructors.py b/holoviews/tests/element/test_elementconstructors.py
similarity index 100%
rename from holoviews/tests/element/testelementconstructors.py
rename to holoviews/tests/element/test_elementconstructors.py
diff --git a/holoviews/tests/element/testelementranges.py b/holoviews/tests/element/test_elementranges.py
similarity index 100%
rename from holoviews/tests/element/testelementranges.py
rename to holoviews/tests/element/test_elementranges.py
diff --git a/holoviews/tests/element/testelementselect.py b/holoviews/tests/element/test_elementselect.py
similarity index 100%
rename from holoviews/tests/element/testelementselect.py
rename to holoviews/tests/element/test_elementselect.py
diff --git a/holoviews/tests/element/testellipsis.py b/holoviews/tests/element/test_ellipsis.py
similarity index 100%
rename from holoviews/tests/element/testellipsis.py
rename to holoviews/tests/element/test_ellipsis.py
diff --git a/holoviews/tests/element/testgraphelement.py b/holoviews/tests/element/test_graphelement.py
similarity index 100%
rename from holoviews/tests/element/testgraphelement.py
rename to holoviews/tests/element/test_graphelement.py
diff --git a/holoviews/tests/element/testimage.py b/holoviews/tests/element/test_image.py
similarity index 100%
rename from holoviews/tests/element/testimage.py
rename to holoviews/tests/element/test_image.py
diff --git a/holoviews/tests/element/testpaths.py b/holoviews/tests/element/test_paths.py
similarity index 100%
rename from holoviews/tests/element/testpaths.py
rename to holoviews/tests/element/test_paths.py
diff --git a/holoviews/tests/element/testraster.py b/holoviews/tests/element/test_raster.py
similarity index 100%
rename from holoviews/tests/element/testraster.py
rename to holoviews/tests/element/test_raster.py
diff --git a/holoviews/tests/element/teststatselements.py b/holoviews/tests/element/test_statselements.py
similarity index 100%
rename from holoviews/tests/element/teststatselements.py
rename to holoviews/tests/element/test_statselements.py
diff --git a/holoviews/tests/element/testtiles.py b/holoviews/tests/element/test_tiles.py
similarity index 100%
rename from holoviews/tests/element/testtiles.py
rename to holoviews/tests/element/test_tiles.py
diff --git a/holoviews/tests/ipython/testdisplayhooks.py b/holoviews/tests/ipython/test_displayhooks.py
similarity index 100%
rename from holoviews/tests/ipython/testdisplayhooks.py
rename to holoviews/tests/ipython/test_displayhooks.py
diff --git a/holoviews/tests/ipython/testmagics.py b/holoviews/tests/ipython/test_magics.py
similarity index 100%
rename from holoviews/tests/ipython/testmagics.py
rename to holoviews/tests/ipython/test_magics.py
diff --git a/holoviews/tests/ipython/testnotebooks.py b/holoviews/tests/ipython/test_notebooks.py
similarity index 100%
rename from holoviews/tests/ipython/testnotebooks.py
rename to holoviews/tests/ipython/test_notebooks.py
diff --git a/holoviews/tests/ipython/testoptscompleter.py b/holoviews/tests/ipython/test_optscompleter.py
similarity index 100%
rename from holoviews/tests/ipython/testoptscompleter.py
rename to holoviews/tests/ipython/test_optscompleter.py
diff --git a/holoviews/tests/ipython/testparsers.py b/holoviews/tests/ipython/test_parsers.py
similarity index 100%
rename from holoviews/tests/ipython/testparsers.py
rename to holoviews/tests/ipython/test_parsers.py
diff --git a/holoviews/tests/operation/testdatashader.py b/holoviews/tests/operation/test_datashader.py
similarity index 100%
rename from holoviews/tests/operation/testdatashader.py
rename to holoviews/tests/operation/test_datashader.py
diff --git a/holoviews/tests/operation/testoperation.py b/holoviews/tests/operation/test_operation.py
similarity index 100%
rename from holoviews/tests/operation/testoperation.py
rename to holoviews/tests/operation/test_operation.py
diff --git a/holoviews/tests/operation/teststatsoperations.py b/holoviews/tests/operation/test_statsoperations.py
similarity index 100%
rename from holoviews/tests/operation/teststatsoperations.py
rename to holoviews/tests/operation/test_statsoperations.py
diff --git a/holoviews/tests/operation/testtimeseriesoperations.py b/holoviews/tests/operation/test_timeseriesoperations.py
similarity index 100%
rename from holoviews/tests/operation/testtimeseriesoperations.py
rename to holoviews/tests/operation/test_timeseriesoperations.py
diff --git a/holoviews/tests/plotting/testcomms.py b/holoviews/tests/plotting/test_comms.py
similarity index 100%
rename from holoviews/tests/plotting/testcomms.py
rename to holoviews/tests/plotting/test_comms.py
diff --git a/holoviews/tests/plotting/testplotutils.py b/holoviews/tests/plotting/test_plotutils.py
similarity index 100%
rename from holoviews/tests/plotting/testplotutils.py
rename to holoviews/tests/plotting/test_plotutils.py
diff --git a/holoviews/tests/plotting/testrenderclass.py b/holoviews/tests/plotting/test_renderclass.py
similarity index 100%
rename from holoviews/tests/plotting/testrenderclass.py
rename to holoviews/tests/plotting/test_renderclass.py
diff --git a/holoviews/tests/testselection.py b/holoviews/tests/test_selection.py
similarity index 100%
rename from holoviews/tests/testselection.py
rename to holoviews/tests/test_selection.py
diff --git a/holoviews/tests/teststreams.py b/holoviews/tests/test_streams.py
similarity index 100%
rename from holoviews/tests/teststreams.py
rename to holoviews/tests/test_streams.py
diff --git a/holoviews/tests/util/testtransform.py b/holoviews/tests/util/test_transform.py
similarity index 100%
rename from holoviews/tests/util/testtransform.py
rename to holoviews/tests/util/test_transform.py
diff --git a/holoviews/tests/util/testutils.py b/holoviews/tests/util/test_utils.py
similarity index 100%
rename from holoviews/tests/util/testutils.py
rename to holoviews/tests/util/test_utils.py
diff --git a/setup.py b/setup.py
index 25a1be141e..85613d5d9c 100644
--- a/setup.py
+++ b/setup.py
@@ -64,7 +64,8 @@
 
 # Test requirements
 extras_require['tests'] = [
-    'nose',
+    'pytest',
+    'pytest-cov',
     'mock',
     'flake8',
     'coveralls',
diff --git a/tox.ini b/tox.ini
index 9a804d2137..4935fedeaf 100644
--- a/tox.ini
+++ b/tox.ini
@@ -3,7 +3,7 @@
 
 [tox]
 #          python version             test group                  extra envs  extra commands
-envlist = {py36,py37,py38}-{flakes,unit,examples,all_recommended,regression}-{default}-{dev,pkg}
+envlist = {py36,py37,py38}-{flakes,unit,examples,all_recommended}-{default}-{dev,pkg}
 
 [_flakes]
 description = Flake check python
@@ -13,13 +13,7 @@ commands = flake8 holoviews
 [_unit]
 description = Run unit tests with coverage
 deps = .[unit_tests]
-passenv = TRAVIS TRAVIS_*
-commands = nosetests holoviews.tests --with-doctest --with-coverage --cover-package=holoviews
-
-[_regression]
-description = Run regression tests
-deps = .[nbtests]
-commands = python ./test_notebooks.py
+commands = pytest panel --cov=./panel
 
 [_examples]
 description = Test that default examples run
@@ -45,14 +39,12 @@ changedir = {envtmpdir}
 commands = examples-pkg: {[_pkg]commands}
            unit: {[_unit]commands}
            flakes: {[_flakes]commands}
-		   regression: {[_regression]commands}
            examples: {[_examples]commands}
            all_recommended: {[_all_recommended]commands}
 
 deps = unit: {[_unit]deps}
        flakes: {[_flakes]deps}
        all_recommended: {[_all_recommended]deps}
-       regression: {[_regression]deps}
 
 [flake8]
 include = *.py