From ddb030ddc82aae8923c2f868203254d4702721e5 Mon Sep 17 00:00:00 2001
From: AlejandroME <2565308+AlejandroME@users.noreply.github.com>
Date: Mon, 16 Oct 2017 15:37:31 -0500
Subject: [PATCH] Unifies tests naming standard

- Renames tests in `cats.tests` package with the "Suite" suffix,
according to #1960 and #1965.
---
 .../free/FreeInvariantMonoidalTests.scala     |  2 +-
 .../src/test/scala/cats/free/FreeTTests.scala |  2 +-
 .../cats/tests/RegressionTests.scala          |  6 +--
 ...ests.scala => AlgebraInvariantSuite.scala} |  2 +-
 ...heck.scala => ApplicativeErrorSuite.scala} |  2 +-
 ...tiveTests.scala => ApplicativeSuite.scala} |  2 +-
 .../tests/{AsTests.scala => AsSuite.scala}    |  2 +-
 ...dableTests.scala => BifoldableSuite.scala} |  2 +-
 ...unctorTests.scala => BifunctorSuite.scala} |  2 +-
 .../{BitSetTests.scala => BitSetSuite.scala}  |  2 +-
 ...verseTests.scala => BitraverseSuite.scala} |  2 +-
 ...ategoryTests.scala => CategorySuite.scala} |  2 +-
 ...leisliTests.scala => CokleisliSuite.scala} |  2 +-
 .../{ComposeTest.scala => ComposeSuite.scala} |  2 +-
 .../{ConstTests.scala => ConstSuite.scala}    |  2 +-
 ...ntTests.scala => ContravariantSuite.scala} |  2 +-
 ...a => CsvCodecInvariantMonoidalSuite.scala} |  6 +--
 ...{EitherKTests.scala => EitherKSuite.scala} |  2 +-
 .../{EitherTests.scala => EitherSuite.scala}  |  2 +-
 ...{EitherTTests.scala => EitherTSuite.scala} |  2 +-
 .../tests/{EqTests.scala => EqSuite.scala}    |  2 +-
 .../{EquivTests.scala => EquivSuite.scala}    |  2 +-
 .../{EvalTests.scala => EvalSuite.scala}      |  2 +-
 ...videnceTests.scala => EvidenceSuite.scala} |  2 +-
 ...oldableTests.scala => FoldableSuite.scala} | 38 +++++++++----------
 .../{FuncTests.scala => FuncSuite.scala}      |  2 +-
 ...ctionKTests.scala => FunctionKSuite.scala} |  2 +-
 ...unctionTests.scala => FunctionSuite.scala} |  2 +-
 ...{FunctorTests.scala => FunctorSuite.scala} |  2 +-
 .../{GroupTests.scala => GroupSuite.scala}    |  2 +-
 .../{HashTests.scala => HashSuite.scala}      |  2 +-
 .../tests/{IdTests.scala => IdSuite.scala}    |  2 +-
 .../tests/{IdTTests.scala => IdTSuite.scala}  |  2 +-
 .../IndexedReaderWriterStateTTests.scala      |  6 +--
 ...eTTests.scala => IndexedStateTSuite.scala} |  8 ++--
 ...{InjectKTests.scala => InjectKSuite.scala} |  2 +-
 .../{InjectTests.scala => InjectSuite.scala}  |  2 +-
 .../tests/{IorTests.scala => IorSuite.scala}  |  2 +-
 .../tests/{IsTests.scala => IsSuite.scala}    |  2 +-
 ...s.scala => KernelContravariantSuite.scala} |  2 +-
 ...{KleisliTests.scala => KleisliSuite.scala} |  2 +-
 .../{ListTests.scala => ListSuite.scala}      |  2 +-
 .../tests/{MapTests.scala => MapSuite.scala}  |  2 +-
 ...ineTests.scala => MonadCombineSuite.scala} |  2 +-
 .../{MonadTest.scala => MonadSuite.scala}     |  2 +-
 .../{MonoidTests.scala => MonoidSuite.scala}  |  4 +-
 .../{NestedTests.scala => NestedSuite.scala}  |  2 +-
 ...istTests.scala => NonEmptyListSuite.scala} |  4 +-
 ...rTests.scala => NonEmptyVectorSuite.scala} |  4 +-
 .../{OneAndTests.scala => OneAndSuite.scala}  |  4 +-
 .../{OptionTests.scala => OptionSuite.scala}  |  2 +-
 ...{OptionTTests.scala => OptionTSuite.scala} |  2 +-
 .../{OrderTests.scala => OrderSuite.scala}    |  4 +-
 ...rderingTests.scala => OrderingSuite.scala} |  2 +-
 ...derTests.scala => PartialOrderSuite.scala} |  4 +-
 ...Tests.scala => PartialOrderingSuite.scala} |  2 +-
 .../{QueueTests.scala => QueueSuite.scala}    |  2 +-
 ...ucibleTests.scala => ReducibleSuite.scala} |  4 +-
 ...ssionTests.scala => RegressionSuite.scala} |  2 +-
 ...igroupTests.scala => SemigroupSuite.scala} |  2 +-
 .../tests/{SetTests.scala => SetSuite.scala}  |  2 +-
 .../{ShowTests.scala => ShowSuite.scala}      |  2 +-
 .../{SplitTest.scala => SplitSuite.scala}     |  2 +-
 .../{StreamTests.scala => StreamSuite.scala}  |  2 +-
 .../{SyntaxTests.scala => SyntaxSuite.scala}  |  2 +-
 ...raverseTests.scala => TraverseSuite.scala} | 20 +++++-----
 .../tests/{TryTests.scala => TrySuite.scala}  |  2 +-
 ...{Tuple2KTests.scala => Tuple2KSuite.scala} |  2 +-
 .../{TupleTests.scala => TupleSuite.scala}    |  2 +-
 ...idatedTests.scala => ValidatedSuite.scala} |  2 +-
 .../{VectorTests.scala => VectorSuite.scala}  |  2 +-
 ...rdCountTest.scala => WordCountSuite.scala} |  2 +-
 .../{WriterTests.scala => WriterSuite.scala}  |  2 +-
 ...{WriterTTests.scala => WriterTSuite.scala} |  2 +-
 74 files changed, 117 insertions(+), 117 deletions(-)
 rename tests/src/test/scala/cats/tests/{AlgebraInvariantTests.scala => AlgebraInvariantSuite.scala} (96%)
 rename tests/src/test/scala/cats/tests/{ApplicativeErrorCheck.scala => ApplicativeErrorSuite.scala} (95%)
 rename tests/src/test/scala/cats/tests/{ApplicativeTests.scala => ApplicativeSuite.scala} (96%)
 rename tests/src/test/scala/cats/tests/{AsTests.scala => AsSuite.scala} (99%)
 rename tests/src/test/scala/cats/tests/{BifoldableTests.scala => BifoldableSuite.scala} (91%)
 rename tests/src/test/scala/cats/tests/{BifunctorTests.scala => BifunctorSuite.scala} (96%)
 rename tests/src/test/scala/cats/tests/{BitSetTests.scala => BitSetSuite.scala} (92%)
 rename tests/src/test/scala/cats/tests/{BitraverseTests.scala => BitraverseSuite.scala} (91%)
 rename tests/src/test/scala/cats/tests/{CategoryTests.scala => CategorySuite.scala} (94%)
 rename tests/src/test/scala/cats/tests/{CokleisliTests.scala => CokleisliSuite.scala} (98%)
 rename tests/src/test/scala/cats/tests/{ComposeTest.scala => ComposeSuite.scala} (95%)
 rename tests/src/test/scala/cats/tests/{ConstTests.scala => ConstSuite.scala} (98%)
 rename tests/src/test/scala/cats/tests/{ContravariantTests.scala => ContravariantSuite.scala} (93%)
 rename tests/src/test/scala/cats/tests/{CsvCodecInvariantMonoidalTests.scala => CsvCodecInvariantMonoidalSuite.scala} (95%)
 rename tests/src/test/scala/cats/tests/{EitherKTests.scala => EitherKSuite.scala} (98%)
 rename tests/src/test/scala/cats/tests/{EitherTests.scala => EitherSuite.scala} (99%)
 rename tests/src/test/scala/cats/tests/{EitherTTests.scala => EitherTSuite.scala} (99%)
 rename tests/src/test/scala/cats/tests/{EqTests.scala => EqSuite.scala} (90%)
 rename tests/src/test/scala/cats/tests/{EquivTests.scala => EquivSuite.scala} (93%)
 rename tests/src/test/scala/cats/tests/{EvalTests.scala => EvalSuite.scala} (99%)
 rename tests/src/test/scala/cats/tests/{EvidenceTests.scala => EvidenceSuite.scala} (89%)
 rename tests/src/test/scala/cats/tests/{FoldableTests.scala => FoldableSuite.scala} (90%)
 rename tests/src/test/scala/cats/tests/{FuncTests.scala => FuncSuite.scala} (98%)
 rename tests/src/test/scala/cats/tests/{FunctionKTests.scala => FunctionKSuite.scala} (98%)
 rename tests/src/test/scala/cats/tests/{FunctionTests.scala => FunctionSuite.scala} (99%)
 rename tests/src/test/scala/cats/tests/{FunctorTests.scala => FunctorSuite.scala} (97%)
 rename tests/src/test/scala/cats/tests/{GroupTests.scala => GroupSuite.scala} (94%)
 rename tests/src/test/scala/cats/tests/{HashTests.scala => HashSuite.scala} (81%)
 rename tests/src/test/scala/cats/tests/{IdTests.scala => IdSuite.scala} (95%)
 rename tests/src/test/scala/cats/tests/{IdTTests.scala => IdTSuite.scala} (98%)
 rename tests/src/test/scala/cats/tests/{IndexedStateTTests.scala => IndexedStateTSuite.scala} (98%)
 rename tests/src/test/scala/cats/tests/{InjectKTests.scala => InjectKSuite.scala} (99%)
 rename tests/src/test/scala/cats/tests/{InjectTests.scala => InjectSuite.scala} (97%)
 rename tests/src/test/scala/cats/tests/{IorTests.scala => IorSuite.scala} (99%)
 rename tests/src/test/scala/cats/tests/{IsTests.scala => IsSuite.scala} (93%)
 rename tests/src/test/scala/cats/tests/{KernelContravariantTests.scala => KernelContravariantSuite.scala} (96%)
 rename tests/src/test/scala/cats/tests/{KleisliTests.scala => KleisliSuite.scala} (99%)
 rename tests/src/test/scala/cats/tests/{ListTests.scala => ListSuite.scala} (97%)
 rename tests/src/test/scala/cats/tests/{MapTests.scala => MapSuite.scala} (96%)
 rename tests/src/test/scala/cats/tests/{MonadCombineTests.scala => MonadCombineSuite.scala} (87%)
 rename tests/src/test/scala/cats/tests/{MonadTest.scala => MonadSuite.scala} (98%)
 rename tests/src/test/scala/cats/tests/{MonoidTests.scala => MonoidSuite.scala} (87%)
 rename tests/src/test/scala/cats/tests/{NestedTests.scala => NestedSuite.scala} (99%)
 rename tests/src/test/scala/cats/tests/{NonEmptyListTests.scala => NonEmptyListSuite.scala} (99%)
 rename tests/src/test/scala/cats/tests/{NonEmptyVectorTests.scala => NonEmptyVectorSuite.scala} (99%)
 rename tests/src/test/scala/cats/tests/{OneAndTests.scala => OneAndSuite.scala} (98%)
 rename tests/src/test/scala/cats/tests/{OptionTests.scala => OptionSuite.scala} (98%)
 rename tests/src/test/scala/cats/tests/{OptionTTests.scala => OptionTSuite.scala} (99%)
 rename tests/src/test/scala/cats/tests/{OrderTests.scala => OrderSuite.scala} (93%)
 rename tests/src/test/scala/cats/tests/{OrderingTests.scala => OrderingSuite.scala} (92%)
 rename tests/src/test/scala/cats/tests/{PartialOrderTests.scala => PartialOrderSuite.scala} (93%)
 rename tests/src/test/scala/cats/tests/{PartialOrderingTests.scala => PartialOrderingSuite.scala} (92%)
 rename tests/src/test/scala/cats/tests/{QueueTests.scala => QueueSuite.scala} (96%)
 rename tests/src/test/scala/cats/tests/{ReducibleTests.scala => ReducibleSuite.scala} (96%)
 rename tests/src/test/scala/cats/tests/{RegressionTests.scala => RegressionSuite.scala} (99%)
 rename tests/src/test/scala/cats/tests/{SemigroupTests.scala => SemigroupSuite.scala} (88%)
 rename tests/src/test/scala/cats/tests/{SetTests.scala => SetSuite.scala} (97%)
 rename tests/src/test/scala/cats/tests/{ShowTests.scala => ShowSuite.scala} (96%)
 rename tests/src/test/scala/cats/tests/{SplitTest.scala => SplitSuite.scala} (78%)
 rename tests/src/test/scala/cats/tests/{StreamTests.scala => StreamSuite.scala} (97%)
 rename tests/src/test/scala/cats/tests/{SyntaxTests.scala => SyntaxSuite.scala} (99%)
 rename tests/src/test/scala/cats/tests/{TraverseTests.scala => TraverseSuite.scala} (78%)
 rename tests/src/test/scala/cats/tests/{TryTests.scala => TrySuite.scala} (99%)
 rename tests/src/test/scala/cats/tests/{Tuple2KTests.scala => Tuple2KSuite.scala} (99%)
 rename tests/src/test/scala/cats/tests/{TupleTests.scala => TupleSuite.scala} (98%)
 rename tests/src/test/scala/cats/tests/{ValidatedTests.scala => ValidatedSuite.scala} (99%)
 rename tests/src/test/scala/cats/tests/{VectorTests.scala => VectorSuite.scala} (97%)
 rename tests/src/test/scala/cats/tests/{WordCountTest.scala => WordCountSuite.scala} (97%)
 rename tests/src/test/scala/cats/tests/{WriterTests.scala => WriterSuite.scala} (94%)
 rename tests/src/test/scala/cats/tests/{WriterTTests.scala => WriterTSuite.scala} (99%)

diff --git a/free/src/test/scala/cats/free/FreeInvariantMonoidalTests.scala b/free/src/test/scala/cats/free/FreeInvariantMonoidalTests.scala
index e4a3fe3283..5334c355b3 100644
--- a/free/src/test/scala/cats/free/FreeInvariantMonoidalTests.scala
+++ b/free/src/test/scala/cats/free/FreeInvariantMonoidalTests.scala
@@ -6,7 +6,7 @@ import cats.free.FreeInvariantMonoidal
 import cats.laws.discipline.{InvariantMonoidalTests, SerializableTests}
 import cats.laws.discipline.SemigroupalTests.Isomorphisms
 import org.scalacheck.{Arbitrary, Gen}
-import cats.tests.CsvCodecInvariantMonoidalTests._
+import cats.tests.CsvCodecInvariantMonoidalSuite._
 
 class FreeInvariantMonoidalTests extends CatsSuite {
   implicit def freeInvariantMonoidalArbitrary[F[_], A](implicit F: Arbitrary[F[A]], A: Arbitrary[A]): Arbitrary[FreeInvariantMonoidal[F, A]] =
diff --git a/free/src/test/scala/cats/free/FreeTTests.scala b/free/src/test/scala/cats/free/FreeTTests.scala
index d61b4eb782..118726127a 100644
--- a/free/src/test/scala/cats/free/FreeTTests.scala
+++ b/free/src/test/scala/cats/free/FreeTTests.scala
@@ -172,7 +172,7 @@ trait FreeTTestsInstances {
   import FreeT._
   import IndexedStateT._
   import cats.kernel.instances.option._
-  import cats.tests.IndexedStateTTests._
+  import cats.tests.IndexedStateTSuite._
   import SemigroupalTests._
 
   type IntState[A] = State[Int, A]
diff --git a/tests/src/test/scala-2.11+/cats/tests/RegressionTests.scala b/tests/src/test/scala-2.11+/cats/tests/RegressionTests.scala
index 86e06bee16..5de9ca8762 100644
--- a/tests/src/test/scala-2.11+/cats/tests/RegressionTests.scala
+++ b/tests/src/test/scala-2.11+/cats/tests/RegressionTests.scala
@@ -2,9 +2,9 @@ package cats
 package tests
 
 
-import ExtraRegressionTests._
+import ExtraRegressionSuite._
 
-class ExtraRegressionTests extends CatsSuite {
+class ExtraRegressionSuite extends CatsSuite {
   /**
    * Placed here to work around scala/bug#6260 on scala 2.10
    */
@@ -14,7 +14,7 @@ class ExtraRegressionTests extends CatsSuite {
 }
 
 
-object ExtraRegressionTests {
+object ExtraRegressionSuite {
   final case class First[A](getFirst: A) extends AnyVal
   object First {
     implicit def showInstance[A](implicit ev: Show[A]): Show[First[A]] = new Show[First[A]] {
diff --git a/tests/src/test/scala/cats/tests/AlgebraInvariantTests.scala b/tests/src/test/scala/cats/tests/AlgebraInvariantSuite.scala
similarity index 96%
rename from tests/src/test/scala/cats/tests/AlgebraInvariantTests.scala
rename to tests/src/test/scala/cats/tests/AlgebraInvariantSuite.scala
index 1607e24a1e..dc6eee0adb 100644
--- a/tests/src/test/scala/cats/tests/AlgebraInvariantTests.scala
+++ b/tests/src/test/scala/cats/tests/AlgebraInvariantSuite.scala
@@ -6,7 +6,7 @@ import cats.laws.discipline.{InvariantMonoidalTests, InvariantTests, Serializabl
 import cats.laws.discipline.eq._
 import org.scalacheck.{Arbitrary, Gen}
 
-class AlgebraInvariantTests extends CatsSuite {
+class AlgebraInvariantSuite extends CatsSuite {
 
   val intMultiplication: Monoid[Int] = new Monoid[Int] {
     val empty = 1
diff --git a/tests/src/test/scala/cats/tests/ApplicativeErrorCheck.scala b/tests/src/test/scala/cats/tests/ApplicativeErrorSuite.scala
similarity index 95%
rename from tests/src/test/scala/cats/tests/ApplicativeErrorCheck.scala
rename to tests/src/test/scala/cats/tests/ApplicativeErrorSuite.scala
index 7b8d8ab006..fc47ff8f1d 100644
--- a/tests/src/test/scala/cats/tests/ApplicativeErrorCheck.scala
+++ b/tests/src/test/scala/cats/tests/ApplicativeErrorSuite.scala
@@ -3,7 +3,7 @@ package tests
 
 import cats.data.EitherT
 
-class ApplicativeErrorCheck extends CatsSuite {
+class ApplicativeErrorSuite extends CatsSuite {
   val failed: Option[Int] =
     (()).raiseError[Option, Int]
 
diff --git a/tests/src/test/scala/cats/tests/ApplicativeTests.scala b/tests/src/test/scala/cats/tests/ApplicativeSuite.scala
similarity index 96%
rename from tests/src/test/scala/cats/tests/ApplicativeTests.scala
rename to tests/src/test/scala/cats/tests/ApplicativeSuite.scala
index c5c11c2e7c..81f36f13be 100644
--- a/tests/src/test/scala/cats/tests/ApplicativeTests.scala
+++ b/tests/src/test/scala/cats/tests/ApplicativeSuite.scala
@@ -4,7 +4,7 @@ package tests
 import cats.Applicative
 
 
-class ApplicativeCheck extends CatsSuite {
+class ApplicativeSuite extends CatsSuite {
 
   test("Applicative#traverse is equivalent to Traverse#traverse") {
     val f: (Int) => Option[Int] = x => Some(x + 1)
diff --git a/tests/src/test/scala/cats/tests/AsTests.scala b/tests/src/test/scala/cats/tests/AsSuite.scala
similarity index 99%
rename from tests/src/test/scala/cats/tests/AsTests.scala
rename to tests/src/test/scala/cats/tests/AsSuite.scala
index acb24d2acf..33a9742a96 100644
--- a/tests/src/test/scala/cats/tests/AsTests.scala
+++ b/tests/src/test/scala/cats/tests/AsSuite.scala
@@ -4,7 +4,7 @@ package tests
 import cats.laws.discipline.{CategoryTests, SerializableTests}
 import org.scalacheck.{Arbitrary, Gen}
 import cats.arrow.Category
-class AsTests extends CatsSuite {
+class AsSuite extends CatsSuite {
   import evidence._
 
   def toMap[A, B, X](fa: List[X])(implicit ev: X <~< (A,B)): Map[A,B] = {
diff --git a/tests/src/test/scala/cats/tests/BifoldableTests.scala b/tests/src/test/scala/cats/tests/BifoldableSuite.scala
similarity index 91%
rename from tests/src/test/scala/cats/tests/BifoldableTests.scala
rename to tests/src/test/scala/cats/tests/BifoldableSuite.scala
index 8dc75de41c..2dc2930c69 100644
--- a/tests/src/test/scala/cats/tests/BifoldableTests.scala
+++ b/tests/src/test/scala/cats/tests/BifoldableSuite.scala
@@ -3,7 +3,7 @@ package tests
 
 import cats.laws.discipline.{BifoldableTests, SerializableTests}
 
-class BifoldableTest extends CatsSuite {
+class BifoldableSuite extends CatsSuite {
   type EitherEither[A, B] = Either[Either[A, B], Either[A, B]]
   val eitherComposeEither: Bifoldable[EitherEither] =
     Bifoldable[Either].compose[Either]
diff --git a/tests/src/test/scala/cats/tests/BifunctorTests.scala b/tests/src/test/scala/cats/tests/BifunctorSuite.scala
similarity index 96%
rename from tests/src/test/scala/cats/tests/BifunctorTests.scala
rename to tests/src/test/scala/cats/tests/BifunctorSuite.scala
index b45c1f77cd..e30fda97b6 100644
--- a/tests/src/test/scala/cats/tests/BifunctorTests.scala
+++ b/tests/src/test/scala/cats/tests/BifunctorSuite.scala
@@ -4,7 +4,7 @@ package tests
 import cats.Bifunctor
 import cats.laws.discipline.{BifunctorTests, FunctorTests, SerializableTests}
 
-class BifunctorTest extends CatsSuite {
+class BifunctorSuite extends CatsSuite {
   type Tuple2Either[A, B] = (Either[A, B], Either[A, B])
   val tuple2ComposeEither: Bifunctor[Tuple2Either] =
     Bifunctor[Tuple2].compose[Either]
diff --git a/tests/src/test/scala/cats/tests/BitSetTests.scala b/tests/src/test/scala/cats/tests/BitSetSuite.scala
similarity index 92%
rename from tests/src/test/scala/cats/tests/BitSetTests.scala
rename to tests/src/test/scala/cats/tests/BitSetSuite.scala
index ac79dc764c..de61ad9d35 100644
--- a/tests/src/test/scala/cats/tests/BitSetTests.scala
+++ b/tests/src/test/scala/cats/tests/BitSetSuite.scala
@@ -5,7 +5,7 @@ import org.scalacheck.Arbitrary.arbitrary
 
 import scala.collection.immutable.BitSet
 
-class BitSetTests extends CatsSuite {
+class BitSetSuite extends CatsSuite {
   implicit val arbitraryBitSet: Arbitrary[BitSet] =
     Arbitrary(arbitrary[List[Short]].map(ns => BitSet(ns.map(_ & 0xffff): _*)))
 
diff --git a/tests/src/test/scala/cats/tests/BitraverseTests.scala b/tests/src/test/scala/cats/tests/BitraverseSuite.scala
similarity index 91%
rename from tests/src/test/scala/cats/tests/BitraverseTests.scala
rename to tests/src/test/scala/cats/tests/BitraverseSuite.scala
index f438b36b19..0664bbda0b 100644
--- a/tests/src/test/scala/cats/tests/BitraverseTests.scala
+++ b/tests/src/test/scala/cats/tests/BitraverseSuite.scala
@@ -3,7 +3,7 @@ package tests
 
 import cats.laws.discipline.{BitraverseTests, SerializableTests}
 
-class BitraverseTest extends CatsSuite {
+class BitraverseSuite extends CatsSuite {
   type EitherTuple2[A, B] = Either[(A, B), (A, B)]
   val eitherComposeTuple2: Bitraverse[EitherTuple2] =
     Bitraverse[Either].compose[Tuple2]
diff --git a/tests/src/test/scala/cats/tests/CategoryTests.scala b/tests/src/test/scala/cats/tests/CategorySuite.scala
similarity index 94%
rename from tests/src/test/scala/cats/tests/CategoryTests.scala
rename to tests/src/test/scala/cats/tests/CategorySuite.scala
index 9c571600af..5f6a1d24b6 100644
--- a/tests/src/test/scala/cats/tests/CategoryTests.scala
+++ b/tests/src/test/scala/cats/tests/CategorySuite.scala
@@ -7,7 +7,7 @@ import cats.arrow.Category
 import cats.laws.discipline.{MonoidKTests, SerializableTests}
 import cats.laws.discipline.eq.catsLawsEqForFn1
 
-class CategoryTest extends CatsSuite {
+class CategorySuite extends CatsSuite {
   val functionCategory = Category[Function1]
   type Endo[A] = Function1[A, A]
 
diff --git a/tests/src/test/scala/cats/tests/CokleisliTests.scala b/tests/src/test/scala/cats/tests/CokleisliSuite.scala
similarity index 98%
rename from tests/src/test/scala/cats/tests/CokleisliTests.scala
rename to tests/src/test/scala/cats/tests/CokleisliSuite.scala
index 74fd48d846..7ffa5f5bad 100644
--- a/tests/src/test/scala/cats/tests/CokleisliTests.scala
+++ b/tests/src/test/scala/cats/tests/CokleisliSuite.scala
@@ -9,7 +9,7 @@ import cats.laws.discipline.arbitrary._
 import cats.laws.discipline.eq._
 import org.scalacheck.Arbitrary
 
-class CokleisliTests extends SlowCatsSuite {
+class CokleisliSuite extends SlowCatsSuite {
 
   implicit override val generatorDrivenConfig: PropertyCheckConfiguration =
     slowCheckConfiguration.copy(
diff --git a/tests/src/test/scala/cats/tests/ComposeTest.scala b/tests/src/test/scala/cats/tests/ComposeSuite.scala
similarity index 95%
rename from tests/src/test/scala/cats/tests/ComposeTest.scala
rename to tests/src/test/scala/cats/tests/ComposeSuite.scala
index 1434642093..3c4d1d50c6 100644
--- a/tests/src/test/scala/cats/tests/ComposeTest.scala
+++ b/tests/src/test/scala/cats/tests/ComposeSuite.scala
@@ -7,7 +7,7 @@ import cats.arrow.Compose
 import cats.laws.discipline.{SemigroupKTests, SerializableTests}
 import cats.laws.discipline.eq.catsLawsEqForFn1
 
-class ComposeTest extends CatsSuite {
+class ComposeSuite extends CatsSuite {
   val functionCompose = Compose[Function1]
   type Endo[A] = Function1[A, A]
 
diff --git a/tests/src/test/scala/cats/tests/ConstTests.scala b/tests/src/test/scala/cats/tests/ConstSuite.scala
similarity index 98%
rename from tests/src/test/scala/cats/tests/ConstTests.scala
rename to tests/src/test/scala/cats/tests/ConstSuite.scala
index 52f12d65fe..68b5dacaf9 100644
--- a/tests/src/test/scala/cats/tests/ConstTests.scala
+++ b/tests/src/test/scala/cats/tests/ConstSuite.scala
@@ -14,7 +14,7 @@ import cats.data.{Const, NonEmptyList}
 import cats.laws.discipline._
 import cats.laws.discipline.arbitrary._
 
-class ConstTests extends CatsSuite {
+class ConstSuite extends CatsSuite {
 
   implicit val iso = SemigroupalTests.Isomorphisms.invariant[Const[String, ?]](Const.catsDataTraverseForConst)
 
diff --git a/tests/src/test/scala/cats/tests/ContravariantTests.scala b/tests/src/test/scala/cats/tests/ContravariantSuite.scala
similarity index 93%
rename from tests/src/test/scala/cats/tests/ContravariantTests.scala
rename to tests/src/test/scala/cats/tests/ContravariantSuite.scala
index 6e356c1b38..c7007b0f8b 100644
--- a/tests/src/test/scala/cats/tests/ContravariantTests.scala
+++ b/tests/src/test/scala/cats/tests/ContravariantSuite.scala
@@ -4,7 +4,7 @@ package tests
 import cats.data.Const
 import org.scalactic.CanEqual
 
-class ContravariantTest extends CatsSuite {
+class ContravariantSuite extends CatsSuite {
 
   test("narrow equals contramap(identity)") {
     implicit val constInst = Const.catsDataContravariantForConst[Int]
diff --git a/tests/src/test/scala/cats/tests/CsvCodecInvariantMonoidalTests.scala b/tests/src/test/scala/cats/tests/CsvCodecInvariantMonoidalSuite.scala
similarity index 95%
rename from tests/src/test/scala/cats/tests/CsvCodecInvariantMonoidalTests.scala
rename to tests/src/test/scala/cats/tests/CsvCodecInvariantMonoidalSuite.scala
index 9137f8d174..e75d0be86d 100644
--- a/tests/src/test/scala/cats/tests/CsvCodecInvariantMonoidalTests.scala
+++ b/tests/src/test/scala/cats/tests/CsvCodecInvariantMonoidalSuite.scala
@@ -8,7 +8,7 @@ import cats.syntax.apply._
 import cats.Eq
 import org.scalacheck.{Arbitrary, Gen}
 
-object CsvCodecInvariantMonoidalTests {
+object CsvCodecInvariantMonoidalSuite {
   type CSV = List[String]
 
   /**
@@ -83,9 +83,9 @@ object CsvCodecInvariantMonoidalTests {
     catsLawsEqForFn1[A, CSV].on[CsvCodec[A]](_.write) and catsLawsEqForFn1[CSV, (Option[A], CSV)].on[CsvCodec[A]](_.read)
 }
 
-class CsvCodecInvariantMonoidalTests extends CatsSuite {
+class CsvCodecInvariantMonoidalSuite extends CatsSuite {
   // Eveything is defined in a companion object to be serializable.
-  import CsvCodecInvariantMonoidalTests._
+  import CsvCodecInvariantMonoidalSuite._
 
   checkAll("InvariantMonoidal[CsvCodec]", InvariantMonoidalTests[CsvCodec].invariantMonoidal[Int, Int, Int])
   checkAll("InvariantMonoidal[CsvCodec]", SerializableTests.serializable(InvariantMonoidal[CsvCodec]))
diff --git a/tests/src/test/scala/cats/tests/EitherKTests.scala b/tests/src/test/scala/cats/tests/EitherKSuite.scala
similarity index 98%
rename from tests/src/test/scala/cats/tests/EitherKTests.scala
rename to tests/src/test/scala/cats/tests/EitherKSuite.scala
index fc0afa918a..9f09bfd241 100644
--- a/tests/src/test/scala/cats/tests/EitherKTests.scala
+++ b/tests/src/test/scala/cats/tests/EitherKSuite.scala
@@ -7,7 +7,7 @@ import cats.laws.discipline._
 import cats.laws.discipline.arbitrary._
 import cats.laws.discipline.eq._
 
-class EitherKTests extends CatsSuite {
+class EitherKSuite extends CatsSuite {
 
   checkAll("EitherK[Option, Option, ?]", TraverseTests[EitherK[Option, Option, ?]].traverse[Int, Int, Int, Int, Option, Option])
   checkAll("Traverse[EitherK[Option, Option, ?]]", SerializableTests.serializable(Traverse[EitherK[Option, Option, ?]]))
diff --git a/tests/src/test/scala/cats/tests/EitherTests.scala b/tests/src/test/scala/cats/tests/EitherSuite.scala
similarity index 99%
rename from tests/src/test/scala/cats/tests/EitherTests.scala
rename to tests/src/test/scala/cats/tests/EitherSuite.scala
index cc63bc3f1a..55c2a37807 100644
--- a/tests/src/test/scala/cats/tests/EitherTests.scala
+++ b/tests/src/test/scala/cats/tests/EitherSuite.scala
@@ -12,7 +12,7 @@ import cats.kernel.laws.discipline.{
 }
 import scala.util.Try
 
-class EitherTests extends CatsSuite {
+class EitherSuite extends CatsSuite {
   implicit val iso = SemigroupalTests.Isomorphisms.invariant[Either[Int, ?]]
 
   checkAll("Either[String, Int]", MonoidLawTests[Either[String, Int]].monoid)
diff --git a/tests/src/test/scala/cats/tests/EitherTTests.scala b/tests/src/test/scala/cats/tests/EitherTSuite.scala
similarity index 99%
rename from tests/src/test/scala/cats/tests/EitherTTests.scala
rename to tests/src/test/scala/cats/tests/EitherTSuite.scala
index c85ff9d9b3..4d453d054f 100644
--- a/tests/src/test/scala/cats/tests/EitherTTests.scala
+++ b/tests/src/test/scala/cats/tests/EitherTSuite.scala
@@ -15,7 +15,7 @@ EqTests => EqLawTests
 }
 
 
-class EitherTTests extends CatsSuite {
+class EitherTSuite extends CatsSuite {
   implicit val iso = SemigroupalTests.Isomorphisms.invariant[EitherT[ListWrapper, String, ?]](EitherT.catsDataFunctorForEitherT(ListWrapper.functor))
 
   {
diff --git a/tests/src/test/scala/cats/tests/EqTests.scala b/tests/src/test/scala/cats/tests/EqSuite.scala
similarity index 90%
rename from tests/src/test/scala/cats/tests/EqTests.scala
rename to tests/src/test/scala/cats/tests/EqSuite.scala
index 9790482255..4b2efeaf73 100644
--- a/tests/src/test/scala/cats/tests/EqTests.scala
+++ b/tests/src/test/scala/cats/tests/EqSuite.scala
@@ -5,7 +5,7 @@ import org.scalatest._
 
 
 
-class EqTests extends FunSuite {
+class EqSuite extends FunSuite {
   {
     import cats.implicits._
     Invariant[Eq]
diff --git a/tests/src/test/scala/cats/tests/EquivTests.scala b/tests/src/test/scala/cats/tests/EquivSuite.scala
similarity index 93%
rename from tests/src/test/scala/cats/tests/EquivTests.scala
rename to tests/src/test/scala/cats/tests/EquivSuite.scala
index d1cedee4aa..26fb8271a6 100644
--- a/tests/src/test/scala/cats/tests/EquivTests.scala
+++ b/tests/src/test/scala/cats/tests/EquivSuite.scala
@@ -6,7 +6,7 @@ import cats.laws.discipline.arbitrary._
 import cats.laws.discipline._
 import cats.laws.discipline.eq._
 
-class EquivTests extends CatsSuite {
+class EquivSuite extends CatsSuite {
 
   Invariant[Equiv]
   Contravariant[Equiv]
diff --git a/tests/src/test/scala/cats/tests/EvalTests.scala b/tests/src/test/scala/cats/tests/EvalSuite.scala
similarity index 99%
rename from tests/src/test/scala/cats/tests/EvalTests.scala
rename to tests/src/test/scala/cats/tests/EvalSuite.scala
index 9bed1f045c..01785774c9 100644
--- a/tests/src/test/scala/cats/tests/EvalTests.scala
+++ b/tests/src/test/scala/cats/tests/EvalSuite.scala
@@ -17,7 +17,7 @@ import org.scalacheck.Arbitrary.arbitrary
 import scala.annotation.tailrec
 import scala.math.min
 
-class EvalTests extends CatsSuite {
+class EvalSuite extends CatsSuite {
   implicit val eqThrow: Eq[Throwable] = Eq.allEqual
 
   /**
diff --git a/tests/src/test/scala/cats/tests/EvidenceTests.scala b/tests/src/test/scala/cats/tests/EvidenceSuite.scala
similarity index 89%
rename from tests/src/test/scala/cats/tests/EvidenceTests.scala
rename to tests/src/test/scala/cats/tests/EvidenceSuite.scala
index 2163bc8364..5cd6f7fb79 100644
--- a/tests/src/test/scala/cats/tests/EvidenceTests.scala
+++ b/tests/src/test/scala/cats/tests/EvidenceSuite.scala
@@ -2,7 +2,7 @@ package cats.tests
 
 import cats.evidence._
 
-class EvidenceTests extends CatsSuite {
+class EvidenceSuite extends CatsSuite {
 
   test("Is / Leibniz") {
 
diff --git a/tests/src/test/scala/cats/tests/FoldableTests.scala b/tests/src/test/scala/cats/tests/FoldableSuite.scala
similarity index 90%
rename from tests/src/test/scala/cats/tests/FoldableTests.scala
rename to tests/src/test/scala/cats/tests/FoldableSuite.scala
index 4d399f6b8a..ca1d55c477 100644
--- a/tests/src/test/scala/cats/tests/FoldableTests.scala
+++ b/tests/src/test/scala/cats/tests/FoldableSuite.scala
@@ -9,7 +9,7 @@ import cats.instances.all._
 import cats.data._
 import cats.laws.discipline.arbitrary._
 
-abstract class FoldableCheck[F[_]: Foldable](name: String)(implicit ArbFInt: Arbitrary[F[Int]], ArbFString: Arbitrary[F[String]]) extends CatsSuite with PropertyChecks {
+abstract class FoldableSuite[F[_]: Foldable](name: String)(implicit ArbFInt: Arbitrary[F[Int]], ArbFString: Arbitrary[F[String]]) extends CatsSuite with PropertyChecks {
 
   def iterator[T](fa: F[T]): Iterator[T]
 
@@ -140,7 +140,7 @@ abstract class FoldableCheck[F[_]: Foldable](name: String)(implicit ArbFInt: Arb
   }
 }
 
-class FoldableTestsAdditional extends CatsSuite {
+class FoldableSuiteAdditional extends CatsSuite {
 
   // exists method written in terms of foldRight
   def contains[F[_]: Foldable, A: Eq](as: F[A], goal: A): Eval[Boolean] =
@@ -303,72 +303,72 @@ class FoldableTestsAdditional extends CatsSuite {
   }
 }
 
-class FoldableListCheck extends FoldableCheck[List]("list") {
+class FoldableListSuite extends FoldableSuite[List]("list") {
   def iterator[T](list: List[T]): Iterator[T] = list.iterator
 }
 
-class FoldableVectorCheck extends FoldableCheck[Vector]("vector") {
+class FoldableVectorSuite extends FoldableSuite[Vector]("vector") {
   def iterator[T](vector: Vector[T]): Iterator[T] = vector.iterator
 }
 
-class FoldableSetCheck extends FoldableCheck[Set]("set") {
+class FoldableSetSuite extends FoldableSuite[Set]("set") {
   def iterator[T](set: Set[T]): Iterator[T] = set.iterator
 }
 
-class FoldableStreamCheck extends FoldableCheck[Stream]("stream") {
+class FoldableStreamSuite extends FoldableSuite[Stream]("stream") {
   def iterator[T](stream: Stream[T]): Iterator[T] = stream.iterator
 }
 
-class FoldableMapCheck extends FoldableCheck[Map[Int, ?]]("map") {
+class FoldableMapSuite extends FoldableSuite[Map[Int, ?]]("map") {
   def iterator[T](map: Map[Int, T]): Iterator[T] = map.valuesIterator
 }
 
-class FoldableOptionCheck extends FoldableCheck[Option]("option") {
+class FoldableOptionSuite extends FoldableSuite[Option]("option") {
   def iterator[T](option: Option[T]): Iterator[T] = option.iterator
 }
 
-class FoldableEitherCheck extends FoldableCheck[Either[Int, ?]]("either") {
+class FoldableEitherSuite extends FoldableSuite[Either[Int, ?]]("either") {
   def iterator[T](either: Either[Int, T]): Iterator[T] = either.right.toOption.iterator
 }
 
-class FoldableValidatedCheck extends FoldableCheck[Validated[String, ?]]("validated") {
+class FoldableValidatedSuite extends FoldableSuite[Validated[String, ?]]("validated") {
   def iterator[T](validated: Validated[String, T]): Iterator[T] = validated.toOption.iterator
 }
 
-class FoldableTryCheck extends FoldableCheck[Try]("try") {
+class FoldableTrySuite extends FoldableSuite[Try]("try") {
   def iterator[T](tryt: Try[T]): Iterator[T] = tryt.toOption.iterator
 }
 
-class FoldableEitherKCheck extends FoldableCheck[EitherK[Option, Option, ?]]("eitherK") {
+class FoldableEitherKSuite extends FoldableSuite[EitherK[Option, Option, ?]]("eitherK") {
   def iterator[T](eitherK: EitherK[Option, Option, T]) = eitherK.run.bimap(_.iterator, _.iterator).merge
 }
 
-class FoldableIorCheck extends FoldableCheck[Int Ior ?]("ior") {
+class FoldableIorSuite extends FoldableSuite[Int Ior ?]("ior") {
   def iterator[T](ior: Int Ior T) =
     ior.fold(_ => None.iterator, b => Some(b).iterator, (_, b) => Some(b).iterator)
 }
 
-class FoldableIdCheck extends FoldableCheck[Id[?]]("id") {
+class FoldableIdSuite extends FoldableSuite[Id[?]]("id") {
   def iterator[T](id: Id[T]) = Some(id).iterator
 }
 
-class FoldableIdTCheck extends FoldableCheck[IdT[Option, ?]]("idT") {
+class FoldableIdTSuite extends FoldableSuite[IdT[Option, ?]]("idT") {
   def iterator[T](idT: IdT[Option, T]) = idT.value.iterator
 }
 
-class FoldableConstCheck extends FoldableCheck[Const[Int, ?]]("const") {
+class FoldableConstSuite extends FoldableSuite[Const[Int, ?]]("const") {
   def iterator[T](const: Const[Int, T]) = None.iterator
 }
 
-class FoldableTuple2Check extends FoldableCheck[(Int, ?)]("tuple2") {
+class FoldableTuple2Suite extends FoldableSuite[(Int, ?)]("tuple2") {
   def iterator[T](tuple: (Int, T)) = Some(tuple._2).iterator
 }
 
-class FoldableOneAndCheck extends FoldableCheck[OneAnd[List, ?]]("oneAnd") {
+class FoldableOneAndSuite extends FoldableSuite[OneAnd[List, ?]]("oneAnd") {
   def iterator[T](oneAnd: OneAnd[List, T]) = (oneAnd.head :: oneAnd.tail).iterator
 }
 
-class FoldableComposedCheck extends FoldableCheck[Nested[List, Option, ?]]("nested") {
+class FoldableComposedSuite extends FoldableSuite[Nested[List, Option, ?]]("nested") {
   def iterator[T](nested: Nested[List, Option, T]) = nested.value.collect {
     case Some(t) => t
   }.iterator
diff --git a/tests/src/test/scala/cats/tests/FuncTests.scala b/tests/src/test/scala/cats/tests/FuncSuite.scala
similarity index 98%
rename from tests/src/test/scala/cats/tests/FuncTests.scala
rename to tests/src/test/scala/cats/tests/FuncSuite.scala
index 8b3e8a45e4..6aec186c66 100644
--- a/tests/src/test/scala/cats/tests/FuncTests.scala
+++ b/tests/src/test/scala/cats/tests/FuncSuite.scala
@@ -8,7 +8,7 @@ import cats.laws.discipline._
 import cats.laws.discipline.arbitrary._
 import org.scalacheck.Arbitrary
 
-class FuncTests extends CatsSuite {
+class FuncSuite extends CatsSuite {
   import cats.laws.discipline.eq._
   implicit def funcEq[F[_], A, B](implicit A: Arbitrary[A], FB: Eq[F[B]]): Eq[Func[F, A, B]] =
     Eq.by[Func[F, A, B], A => F[B]](_.run)
diff --git a/tests/src/test/scala/cats/tests/FunctionKTests.scala b/tests/src/test/scala/cats/tests/FunctionKSuite.scala
similarity index 98%
rename from tests/src/test/scala/cats/tests/FunctionKTests.scala
rename to tests/src/test/scala/cats/tests/FunctionKSuite.scala
index 513bdfbb40..bdb7816be8 100644
--- a/tests/src/test/scala/cats/tests/FunctionKTests.scala
+++ b/tests/src/test/scala/cats/tests/FunctionKSuite.scala
@@ -6,7 +6,7 @@ import cats.data.EitherK
 import cats.data.NonEmptyList
 import cats.laws.discipline.arbitrary._
 
-class FunctionKTests extends CatsSuite {
+class FunctionKSuite extends CatsSuite {
 
   val listToOption = λ[FunctionK[List, Option]](_.headOption)
   val listToVector = λ[FunctionK[List, Vector]](_.toVector)
diff --git a/tests/src/test/scala/cats/tests/FunctionTests.scala b/tests/src/test/scala/cats/tests/FunctionSuite.scala
similarity index 99%
rename from tests/src/test/scala/cats/tests/FunctionTests.scala
rename to tests/src/test/scala/cats/tests/FunctionSuite.scala
index 52784bdcb4..eed9c628e8 100644
--- a/tests/src/test/scala/cats/tests/FunctionTests.scala
+++ b/tests/src/test/scala/cats/tests/FunctionSuite.scala
@@ -25,7 +25,7 @@ import cats.kernel.{CommutativeGroup, CommutativeMonoid, CommutativeSemigroup}
 import cats.kernel.{Band, BoundedSemilattice, Semilattice}
 
 
-class FunctionTests extends CatsSuite {
+class FunctionSuite extends CatsSuite {
 
   import Helpers._
 
diff --git a/tests/src/test/scala/cats/tests/FunctorTests.scala b/tests/src/test/scala/cats/tests/FunctorSuite.scala
similarity index 97%
rename from tests/src/test/scala/cats/tests/FunctorTests.scala
rename to tests/src/test/scala/cats/tests/FunctorSuite.scala
index e98940b61f..3b7c74ace0 100644
--- a/tests/src/test/scala/cats/tests/FunctorTests.scala
+++ b/tests/src/test/scala/cats/tests/FunctorSuite.scala
@@ -1,7 +1,7 @@
 package cats
 package tests
 
-class FunctorTest extends CatsSuite {
+class FunctorSuite extends CatsSuite {
   test("void replaces values with unit preserving structure") {
     forAll { (l: List[Int], o: Option[Int], m: Map[String, Int]) =>
       l.void should === (List.fill(l.length)(()))
diff --git a/tests/src/test/scala/cats/tests/GroupTests.scala b/tests/src/test/scala/cats/tests/GroupSuite.scala
similarity index 94%
rename from tests/src/test/scala/cats/tests/GroupTests.scala
rename to tests/src/test/scala/cats/tests/GroupSuite.scala
index 8ba012e322..f9359039f1 100644
--- a/tests/src/test/scala/cats/tests/GroupTests.scala
+++ b/tests/src/test/scala/cats/tests/GroupSuite.scala
@@ -3,7 +3,7 @@ package tests
 
 import cats.kernel.laws.discipline.{GroupTests => GroupLawTests}
 
-class GroupTests extends CatsSuite {
+class GroupSuite extends CatsSuite {
   test("combine minValue") {
     Group[Int].combineN(1, Int.MinValue) should ===(Int.MinValue)
   }
diff --git a/tests/src/test/scala/cats/tests/HashTests.scala b/tests/src/test/scala/cats/tests/HashSuite.scala
similarity index 81%
rename from tests/src/test/scala/cats/tests/HashTests.scala
rename to tests/src/test/scala/cats/tests/HashSuite.scala
index 037122b2a6..908b9a9bcd 100644
--- a/tests/src/test/scala/cats/tests/HashTests.scala
+++ b/tests/src/test/scala/cats/tests/HashSuite.scala
@@ -2,7 +2,7 @@ package cats
 package tests
 
 
-class HashTests extends CatsSuite {
+class HashSuite extends CatsSuite {
 
   {
     Invariant[Hash]
diff --git a/tests/src/test/scala/cats/tests/IdTests.scala b/tests/src/test/scala/cats/tests/IdSuite.scala
similarity index 95%
rename from tests/src/test/scala/cats/tests/IdTests.scala
rename to tests/src/test/scala/cats/tests/IdSuite.scala
index 1040a08abd..f2467a9ae9 100644
--- a/tests/src/test/scala/cats/tests/IdTests.scala
+++ b/tests/src/test/scala/cats/tests/IdSuite.scala
@@ -3,7 +3,7 @@ package tests
 
 import cats.laws.discipline._
 
-class IdTests extends CatsSuite {
+class IdSuite extends CatsSuite {
   implicit val iso = SemigroupalTests.Isomorphisms.invariant[Id]
 
   checkAll("Id[Int]", BimonadTests[Id].bimonad[Int, Int, Int])
diff --git a/tests/src/test/scala/cats/tests/IdTTests.scala b/tests/src/test/scala/cats/tests/IdTSuite.scala
similarity index 98%
rename from tests/src/test/scala/cats/tests/IdTTests.scala
rename to tests/src/test/scala/cats/tests/IdTSuite.scala
index c6739f50a3..4c2451d3bf 100644
--- a/tests/src/test/scala/cats/tests/IdTTests.scala
+++ b/tests/src/test/scala/cats/tests/IdTSuite.scala
@@ -9,7 +9,7 @@ import cats.kernel.laws.discipline.{
 import cats.laws.discipline._
 import cats.laws.discipline.arbitrary._
 
-class IdTTests extends CatsSuite {
+class IdTSuite extends CatsSuite {
 
   implicit val iso = SemigroupalTests.Isomorphisms.invariant[IdT[ListWrapper, ?]](IdT.catsDataFunctorForIdT(ListWrapper.functor))
 
diff --git a/tests/src/test/scala/cats/tests/IndexedReaderWriterStateTTests.scala b/tests/src/test/scala/cats/tests/IndexedReaderWriterStateTTests.scala
index e319f8ccfa..45748955ea 100644
--- a/tests/src/test/scala/cats/tests/IndexedReaderWriterStateTTests.scala
+++ b/tests/src/test/scala/cats/tests/IndexedReaderWriterStateTTests.scala
@@ -9,8 +9,8 @@ import cats.laws.discipline.arbitrary._
 import org.scalacheck.Arbitrary
 import cats.arrow.{Strong, Profunctor}
 
-class ReaderWriterStateTTests extends CatsSuite {
-  import ReaderWriterStateTTests._
+class ReaderWriterStateTSuite extends CatsSuite {
+  import ReaderWriterStateTSuite._
 
   test("Basic ReaderWriterState usage") {
     forAll { (context: String, initial: Int) =>
@@ -375,7 +375,7 @@ class ReaderWriterStateTTests extends CatsSuite {
 
 }
 
-object ReaderWriterStateTTests {
+object ReaderWriterStateTSuite {
   def addAndLog(i: Int): ReaderWriterState[String, Vector[String], Int, Int] = {
     import cats.instances.vector._
 
diff --git a/tests/src/test/scala/cats/tests/IndexedStateTTests.scala b/tests/src/test/scala/cats/tests/IndexedStateTSuite.scala
similarity index 98%
rename from tests/src/test/scala/cats/tests/IndexedStateTTests.scala
rename to tests/src/test/scala/cats/tests/IndexedStateTSuite.scala
index 04609d4cf8..a708a0b64f 100644
--- a/tests/src/test/scala/cats/tests/IndexedStateTTests.scala
+++ b/tests/src/test/scala/cats/tests/IndexedStateTSuite.scala
@@ -11,12 +11,12 @@ import cats.laws.discipline.eq._
 import cats.laws.discipline.arbitrary._
 import org.scalacheck.Arbitrary
 
-class IndexedStateTTests extends CatsSuite {
+class IndexedStateTSuite extends CatsSuite {
 
   implicit override val generatorDrivenConfig: PropertyCheckConfiguration =
     checkConfiguration.copy(sizeRange = 5)
 
-  import IndexedStateTTests._
+  import IndexedStateTSuite._
 
   test("basic state usage"){
     add1.run(1).value should === (2 -> 1)
@@ -383,14 +383,14 @@ class IndexedStateTTests extends CatsSuite {
 
 }
 
-object IndexedStateTTests extends IndexedStateTTestsInstances {
+object IndexedStateTSuite extends IndexedStateTSuiteInstances {
   implicit def stateEq[S:Eq:Arbitrary, A:Eq]: Eq[State[S, A]] =
     indexedStateTEq[Eval, S, S, A]
 
   val add1: State[Int, Int] = State(n => (n + 1, n))
 }
 
-sealed trait IndexedStateTTestsInstances {
+sealed trait IndexedStateTSuiteInstances {
 
   implicit def indexedStateTEq[F[_], SA, SB, A](implicit SA: Arbitrary[SA], FSB: Eq[F[(SB, A)]], F: FlatMap[F]): Eq[IndexedStateT[F, SA, SB, A]] =
     Eq.by[IndexedStateT[F, SA, SB, A], SA => F[(SB, A)]](state =>
diff --git a/tests/src/test/scala/cats/tests/InjectKTests.scala b/tests/src/test/scala/cats/tests/InjectKSuite.scala
similarity index 99%
rename from tests/src/test/scala/cats/tests/InjectKTests.scala
rename to tests/src/test/scala/cats/tests/InjectKSuite.scala
index 991c57952a..7b7003cd57 100644
--- a/tests/src/test/scala/cats/tests/InjectKTests.scala
+++ b/tests/src/test/scala/cats/tests/InjectKSuite.scala
@@ -5,7 +5,7 @@ import cats.laws.discipline.{ InjectKTests => InjectKTypeclassTests }
 import cats.tests.CatsSuite
 import org.scalacheck._
 
-class InjectKTests extends CatsSuite {
+class InjectKSuite extends CatsSuite {
 
   sealed trait Test1Algebra[A]
 
diff --git a/tests/src/test/scala/cats/tests/InjectTests.scala b/tests/src/test/scala/cats/tests/InjectSuite.scala
similarity index 97%
rename from tests/src/test/scala/cats/tests/InjectTests.scala
rename to tests/src/test/scala/cats/tests/InjectSuite.scala
index 2d667d6dee..fe6146eb4b 100644
--- a/tests/src/test/scala/cats/tests/InjectTests.scala
+++ b/tests/src/test/scala/cats/tests/InjectSuite.scala
@@ -3,7 +3,7 @@ package cats
 import cats.laws.discipline.{ InjectTests => InjectTypeclassTests }
 import cats.tests.CatsSuite
 
-class InjectTests extends CatsSuite {
+class InjectSuite extends CatsSuite {
 
   type StringOrInt = Either[String, Int]
 
diff --git a/tests/src/test/scala/cats/tests/IorTests.scala b/tests/src/test/scala/cats/tests/IorSuite.scala
similarity index 99%
rename from tests/src/test/scala/cats/tests/IorTests.scala
rename to tests/src/test/scala/cats/tests/IorSuite.scala
index fe4b0d7569..5c5b07e0fa 100644
--- a/tests/src/test/scala/cats/tests/IorTests.scala
+++ b/tests/src/test/scala/cats/tests/IorSuite.scala
@@ -7,7 +7,7 @@ import cats.data.{Ior, NonEmptyList, EitherT}
 import cats.laws.discipline.arbitrary._
 import org.scalacheck.Arbitrary._
 
-class IorTests extends CatsSuite {
+class IorSuite extends CatsSuite {
 
   implicit val iso = SemigroupalTests.Isomorphisms.invariant[Ior[String, ?]]
 
diff --git a/tests/src/test/scala/cats/tests/IsTests.scala b/tests/src/test/scala/cats/tests/IsSuite.scala
similarity index 93%
rename from tests/src/test/scala/cats/tests/IsTests.scala
rename to tests/src/test/scala/cats/tests/IsSuite.scala
index fba2ebe63b..6d2ef5050a 100644
--- a/tests/src/test/scala/cats/tests/IsTests.scala
+++ b/tests/src/test/scala/cats/tests/IsSuite.scala
@@ -1,7 +1,7 @@
 package cats
 package tests
 
-class IsTests extends CatsSuite {
+class IsSuite extends CatsSuite {
   import evidence._
 
   test("syntax") {
diff --git a/tests/src/test/scala/cats/tests/KernelContravariantTests.scala b/tests/src/test/scala/cats/tests/KernelContravariantSuite.scala
similarity index 96%
rename from tests/src/test/scala/cats/tests/KernelContravariantTests.scala
rename to tests/src/test/scala/cats/tests/KernelContravariantSuite.scala
index 0aefd2e63f..39bf707198 100644
--- a/tests/src/test/scala/cats/tests/KernelContravariantTests.scala
+++ b/tests/src/test/scala/cats/tests/KernelContravariantSuite.scala
@@ -6,7 +6,7 @@ import cats.laws.discipline.arbitrary._
 import cats.laws.discipline._
 import cats.laws.discipline.eq._
 
-class KernelContravariantTests extends CatsSuite {
+class KernelContravariantSuite extends CatsSuite {
   Invariant[Eq]
   Contravariant[Eq]
   Semigroupal[Eq]
diff --git a/tests/src/test/scala/cats/tests/KleisliTests.scala b/tests/src/test/scala/cats/tests/KleisliSuite.scala
similarity index 99%
rename from tests/src/test/scala/cats/tests/KleisliTests.scala
rename to tests/src/test/scala/cats/tests/KleisliSuite.scala
index c3255999d8..856666310a 100644
--- a/tests/src/test/scala/cats/tests/KleisliTests.scala
+++ b/tests/src/test/scala/cats/tests/KleisliSuite.scala
@@ -11,7 +11,7 @@ import org.scalacheck.Arbitrary
 import cats.kernel.laws.discipline.{MonoidTests => MonoidLawTests, SemigroupTests => SemigroupLawTests}
 import cats.laws.discipline.{SemigroupKTests, MonoidKTests}
 
-class KleisliTests extends CatsSuite {
+class KleisliSuite extends CatsSuite {
   implicit def kleisliEq[F[_], A, B](implicit A: Arbitrary[A], FB: Eq[F[B]]): Eq[Kleisli[F, A, B]] =
     Eq.by[Kleisli[F, A, B], A => F[B]](_.run)
 
diff --git a/tests/src/test/scala/cats/tests/ListTests.scala b/tests/src/test/scala/cats/tests/ListSuite.scala
similarity index 97%
rename from tests/src/test/scala/cats/tests/ListTests.scala
rename to tests/src/test/scala/cats/tests/ListSuite.scala
index 2b28f3dbd5..8f881438f2 100644
--- a/tests/src/test/scala/cats/tests/ListTests.scala
+++ b/tests/src/test/scala/cats/tests/ListSuite.scala
@@ -5,7 +5,7 @@ import cats.data.NonEmptyList
 import cats.laws.discipline.{TraverseTests, CoflatMapTests, AlternativeTests, SerializableTests, SemigroupalTests}
 import cats.laws.discipline.arbitrary._
 
-class ListTests extends CatsSuite {
+class ListSuite extends CatsSuite {
 
   checkAll("List[Int]", SemigroupalTests[List].semigroupal[Int, Int, Int])
   checkAll("Semigroupal[List]", SerializableTests.serializable(Semigroupal[List]))
diff --git a/tests/src/test/scala/cats/tests/MapTests.scala b/tests/src/test/scala/cats/tests/MapSuite.scala
similarity index 96%
rename from tests/src/test/scala/cats/tests/MapTests.scala
rename to tests/src/test/scala/cats/tests/MapSuite.scala
index b4d403cbd0..3287a429a6 100644
--- a/tests/src/test/scala/cats/tests/MapTests.scala
+++ b/tests/src/test/scala/cats/tests/MapSuite.scala
@@ -3,7 +3,7 @@ package tests
 
 import cats.laws.discipline.{TraverseTests, FlatMapTests, SerializableTests, SemigroupalTests}
 
-class MapTests extends CatsSuite {
+class MapSuite extends CatsSuite {
   implicit val iso = SemigroupalTests.Isomorphisms.invariant[Map[Int, ?]]
 
   checkAll("Map[Int, Int]", SemigroupalTests[Map[Int, ?]].semigroupal[Int, Int, Int])
diff --git a/tests/src/test/scala/cats/tests/MonadCombineTests.scala b/tests/src/test/scala/cats/tests/MonadCombineSuite.scala
similarity index 87%
rename from tests/src/test/scala/cats/tests/MonadCombineTests.scala
rename to tests/src/test/scala/cats/tests/MonadCombineSuite.scala
index fbe83aea5f..2176a2e361 100644
--- a/tests/src/test/scala/cats/tests/MonadCombineTests.scala
+++ b/tests/src/test/scala/cats/tests/MonadCombineSuite.scala
@@ -1,7 +1,7 @@
 package cats
 package tests
 
-class MonadCombineTest extends CatsSuite {
+class MonadCombineSuite extends CatsSuite {
   test("separate") {
     forAll { (list: List[Either[Int, String]]) =>
       val ints = list.collect { case Left(i) => i }
diff --git a/tests/src/test/scala/cats/tests/MonadTest.scala b/tests/src/test/scala/cats/tests/MonadSuite.scala
similarity index 98%
rename from tests/src/test/scala/cats/tests/MonadTest.scala
rename to tests/src/test/scala/cats/tests/MonadSuite.scala
index 3232174ac2..25d2b3ac14 100644
--- a/tests/src/test/scala/cats/tests/MonadTest.scala
+++ b/tests/src/test/scala/cats/tests/MonadSuite.scala
@@ -4,7 +4,7 @@ package tests
 import cats.data.{IndexedStateT, StateT}
 import org.scalacheck.Gen
 
-class MonadTest extends CatsSuite {
+class MonadSuite extends CatsSuite {
   implicit val testInstance: Monad[StateT[Id, Int, ?]] = IndexedStateT.catsDataMonadForIndexedStateT[Id, Int]
 
   val smallPosInt = Gen.choose(1, 5000)
diff --git a/tests/src/test/scala/cats/tests/MonoidTests.scala b/tests/src/test/scala/cats/tests/MonoidSuite.scala
similarity index 87%
rename from tests/src/test/scala/cats/tests/MonoidTests.scala
rename to tests/src/test/scala/cats/tests/MonoidSuite.scala
index dc14ca85f6..2d53032050 100644
--- a/tests/src/test/scala/cats/tests/MonoidTests.scala
+++ b/tests/src/test/scala/cats/tests/MonoidSuite.scala
@@ -3,7 +3,7 @@ package tests
 
 
 
-class MonoidTests extends CatsSuite {
+class MonoidSuite extends CatsSuite {
   {
     Invariant[Monoid]
     Semigroupal[Monoid]
@@ -17,7 +17,7 @@ class MonoidTests extends CatsSuite {
   }
 }
 
-object MonoidTests {
+object MonoidSuite {
   def summonInstance(): Unit = {
     import cats.instances.monoid._
     Invariant[Monoid]
diff --git a/tests/src/test/scala/cats/tests/NestedTests.scala b/tests/src/test/scala/cats/tests/NestedSuite.scala
similarity index 99%
rename from tests/src/test/scala/cats/tests/NestedTests.scala
rename to tests/src/test/scala/cats/tests/NestedSuite.scala
index 3bf0425f75..2709ef832d 100644
--- a/tests/src/test/scala/cats/tests/NestedTests.scala
+++ b/tests/src/test/scala/cats/tests/NestedSuite.scala
@@ -9,7 +9,7 @@ import cats.laws.discipline.SemigroupalTests.Isomorphisms._
 import cats.laws.discipline.arbitrary._
 import cats.laws.discipline.eq.catsLawsEqForShow
 
-class NestedTests extends CatsSuite {
+class NestedSuite extends CatsSuite {
   // we have a lot of generated lists of lists in these tests. We have to tell
   // Scalacheck to calm down a bit so we don't hit memory and test duration
   // issues.
diff --git a/tests/src/test/scala/cats/tests/NonEmptyListTests.scala b/tests/src/test/scala/cats/tests/NonEmptyListSuite.scala
similarity index 99%
rename from tests/src/test/scala/cats/tests/NonEmptyListTests.scala
rename to tests/src/test/scala/cats/tests/NonEmptyListSuite.scala
index 2e1497dcc0..5330d2ca9a 100644
--- a/tests/src/test/scala/cats/tests/NonEmptyListTests.scala
+++ b/tests/src/test/scala/cats/tests/NonEmptyListSuite.scala
@@ -12,7 +12,7 @@ import cats.data.{NonEmptyList, NonEmptyVector}
 import cats.laws.discipline.arbitrary._
 import cats.laws.discipline.{ComonadTests, NonEmptyTraverseTests, MonadTests, ReducibleTests, SemigroupKTests, SerializableTests}
 
-class NonEmptyListTests extends CatsSuite {
+class NonEmptyListSuite extends CatsSuite {
   // Lots of collections here.. telling ScalaCheck to calm down a bit
   implicit override val generatorDrivenConfig: PropertyCheckConfiguration =
     PropertyCheckConfiguration(minSuccessful = 20, sizeRange = 5)
@@ -312,7 +312,7 @@ class NonEmptyListTests extends CatsSuite {
   }
 }
 
-class ReducibleNonEmptyListCheck extends ReducibleCheck[NonEmptyList]("NonEmptyList") {
+class ReducibleNonEmptyListSuite extends ReducibleSuite[NonEmptyList]("NonEmptyList") {
   def iterator[T](nel: NonEmptyList[T]): Iterator[T] = nel.toList.iterator
 
   def range(start: Long, endInclusive: Long): NonEmptyList[Long] = {
diff --git a/tests/src/test/scala/cats/tests/NonEmptyVectorTests.scala b/tests/src/test/scala/cats/tests/NonEmptyVectorSuite.scala
similarity index 99%
rename from tests/src/test/scala/cats/tests/NonEmptyVectorTests.scala
rename to tests/src/test/scala/cats/tests/NonEmptyVectorSuite.scala
index 93b3284d34..168b169d76 100644
--- a/tests/src/test/scala/cats/tests/NonEmptyVectorTests.scala
+++ b/tests/src/test/scala/cats/tests/NonEmptyVectorSuite.scala
@@ -14,7 +14,7 @@ import cats.laws.discipline.arbitrary._
 
 import scala.util.Properties
 
-class NonEmptyVectorTests extends CatsSuite {
+class NonEmptyVectorSuite extends CatsSuite {
   // Lots of collections here.. telling ScalaCheck to calm down a bit
   implicit override val generatorDrivenConfig: PropertyCheckConfiguration =
     PropertyCheckConfiguration(minSuccessful = 20, sizeRange = 5)
@@ -335,7 +335,7 @@ class NonEmptyVectorTests extends CatsSuite {
   }
 }
 
-class ReducibleNonEmptyVectorCheck extends ReducibleCheck[NonEmptyVector]("NonEmptyVector") {
+class ReducibleNonEmptyVectorSuite extends ReducibleSuite[NonEmptyVector]("NonEmptyVector") {
   def iterator[T](nel: NonEmptyVector[T]): Iterator[T] = nel.toVector.iterator
 
   def range(start: Long, endInclusive: Long): NonEmptyVector[Long] = {
diff --git a/tests/src/test/scala/cats/tests/OneAndTests.scala b/tests/src/test/scala/cats/tests/OneAndSuite.scala
similarity index 98%
rename from tests/src/test/scala/cats/tests/OneAndTests.scala
rename to tests/src/test/scala/cats/tests/OneAndSuite.scala
index d344cc8ab4..de9920c004 100644
--- a/tests/src/test/scala/cats/tests/OneAndTests.scala
+++ b/tests/src/test/scala/cats/tests/OneAndSuite.scala
@@ -11,7 +11,7 @@ import cats.data.{NonEmptyStream, OneAnd}
 import cats.laws.discipline.{ComonadTests, FunctorTests, SemigroupKTests, FoldableTests, MonadTests, SerializableTests, SemigroupalTests, TraverseTests, NonEmptyTraverseTests, ReducibleTests}
 import cats.laws.discipline.arbitrary._
 
-class OneAndTests extends CatsSuite {
+class OneAndSuite extends CatsSuite {
   // Lots of collections here.. telling ScalaCheck to calm down a bit
   implicit override val generatorDrivenConfig: PropertyCheckConfiguration =
     PropertyCheckConfiguration(minSuccessful = 20, sizeRange = 5)
@@ -199,7 +199,7 @@ class OneAndTests extends CatsSuite {
 
 }
 
-class ReducibleNonEmptyStreamCheck extends ReducibleCheck[NonEmptyStream]("NonEmptyStream") {
+class ReducibleNonEmptyStreamSuite extends ReducibleSuite[NonEmptyStream]("NonEmptyStream") {
   def iterator[T](nes: NonEmptyStream[T]): Iterator[T] =
     (nes.head #:: nes.tail).iterator
 
diff --git a/tests/src/test/scala/cats/tests/OptionTests.scala b/tests/src/test/scala/cats/tests/OptionSuite.scala
similarity index 98%
rename from tests/src/test/scala/cats/tests/OptionTests.scala
rename to tests/src/test/scala/cats/tests/OptionSuite.scala
index a9aef3ce54..1b88cc6750 100644
--- a/tests/src/test/scala/cats/tests/OptionTests.scala
+++ b/tests/src/test/scala/cats/tests/OptionSuite.scala
@@ -4,7 +4,7 @@ package tests
 import cats.laws.{ApplicativeLaws, CoflatMapLaws, FlatMapLaws, MonadLaws}
 import cats.laws.discipline._
 
-class OptionTests extends CatsSuite {
+class OptionSuite extends CatsSuite {
   checkAll("Option[Int]", SemigroupalTests[Option].semigroupal[Int, Int, Int])
   checkAll("Semigroupal[Option]", SerializableTests.serializable(Semigroupal[Option]))
 
diff --git a/tests/src/test/scala/cats/tests/OptionTTests.scala b/tests/src/test/scala/cats/tests/OptionTSuite.scala
similarity index 99%
rename from tests/src/test/scala/cats/tests/OptionTTests.scala
rename to tests/src/test/scala/cats/tests/OptionTSuite.scala
index 705cdc610c..8373f73181 100644
--- a/tests/src/test/scala/cats/tests/OptionTTests.scala
+++ b/tests/src/test/scala/cats/tests/OptionTSuite.scala
@@ -12,7 +12,7 @@ import cats.kernel.laws.discipline.{
 import cats.laws.discipline._
 import cats.laws.discipline.arbitrary._
 
-class OptionTTests extends CatsSuite {
+class OptionTSuite extends CatsSuite {
   implicit val iso = SemigroupalTests.Isomorphisms.invariant[OptionT[ListWrapper, ?]](OptionT.catsDataFunctorForOptionT(ListWrapper.functor))
 
   {
diff --git a/tests/src/test/scala/cats/tests/OrderTests.scala b/tests/src/test/scala/cats/tests/OrderSuite.scala
similarity index 93%
rename from tests/src/test/scala/cats/tests/OrderTests.scala
rename to tests/src/test/scala/cats/tests/OrderSuite.scala
index 450bb8b429..f64ef518e3 100644
--- a/tests/src/test/scala/cats/tests/OrderTests.scala
+++ b/tests/src/test/scala/cats/tests/OrderSuite.scala
@@ -4,7 +4,7 @@ package tests
 
 import cats.kernel.laws.discipline.{OrderTests => OrderLawTests}
 
-class OrderTests extends CatsSuite {
+class OrderSuite extends CatsSuite {
   {
     Invariant[Order]
     Contravariant[Order]
@@ -16,7 +16,7 @@ class OrderTests extends CatsSuite {
   checkAll("Long", OrderLawTests[Long].order)
 }
 
-object OrderTests {
+object OrderSuite {
   def summonInstance(): Unit = {
     import cats.instances.order._
     Invariant[Order]
diff --git a/tests/src/test/scala/cats/tests/OrderingTests.scala b/tests/src/test/scala/cats/tests/OrderingSuite.scala
similarity index 92%
rename from tests/src/test/scala/cats/tests/OrderingTests.scala
rename to tests/src/test/scala/cats/tests/OrderingSuite.scala
index f00d3d6434..2af60c5992 100644
--- a/tests/src/test/scala/cats/tests/OrderingTests.scala
+++ b/tests/src/test/scala/cats/tests/OrderingSuite.scala
@@ -6,7 +6,7 @@ import cats.laws.discipline.arbitrary._
 import cats.laws.discipline._
 import cats.laws.discipline.eq._
 
-class OrderingTests extends CatsSuite {
+class OrderingSuite extends CatsSuite {
 
   Invariant[Ordering]
   Contravariant[Ordering]
diff --git a/tests/src/test/scala/cats/tests/PartialOrderTests.scala b/tests/src/test/scala/cats/tests/PartialOrderSuite.scala
similarity index 93%
rename from tests/src/test/scala/cats/tests/PartialOrderTests.scala
rename to tests/src/test/scala/cats/tests/PartialOrderSuite.scala
index bf8d42e49b..0990617f0b 100644
--- a/tests/src/test/scala/cats/tests/PartialOrderTests.scala
+++ b/tests/src/test/scala/cats/tests/PartialOrderSuite.scala
@@ -3,7 +3,7 @@ package tests
 
 
 
-class PartialOrderTests extends CatsSuite {
+class PartialOrderSuite extends CatsSuite {
   {
     Invariant[PartialOrder]
     Contravariant[PartialOrder]
@@ -23,7 +23,7 @@ class PartialOrderTests extends CatsSuite {
   }
 }
 
-object PartialOrderTests {
+object PartialOrderSuite {
   def summonInstance(): Unit = {
     import cats.instances.partialOrder._
     Invariant[PartialOrder]
diff --git a/tests/src/test/scala/cats/tests/PartialOrderingTests.scala b/tests/src/test/scala/cats/tests/PartialOrderingSuite.scala
similarity index 92%
rename from tests/src/test/scala/cats/tests/PartialOrderingTests.scala
rename to tests/src/test/scala/cats/tests/PartialOrderingSuite.scala
index f5d02643b1..81d3e37b2a 100644
--- a/tests/src/test/scala/cats/tests/PartialOrderingTests.scala
+++ b/tests/src/test/scala/cats/tests/PartialOrderingSuite.scala
@@ -6,7 +6,7 @@ import cats.laws.discipline.arbitrary._
 import cats.laws.discipline._
 import cats.laws.discipline.eq._
 
-class PartialOrderingTests extends CatsSuite {
+class PartialOrderingSuite extends CatsSuite {
 
   Invariant[PartialOrdering]
   Contravariant[PartialOrdering]
diff --git a/tests/src/test/scala/cats/tests/QueueTests.scala b/tests/src/test/scala/cats/tests/QueueSuite.scala
similarity index 96%
rename from tests/src/test/scala/cats/tests/QueueTests.scala
rename to tests/src/test/scala/cats/tests/QueueSuite.scala
index 4963db0435..621724855b 100644
--- a/tests/src/test/scala/cats/tests/QueueTests.scala
+++ b/tests/src/test/scala/cats/tests/QueueSuite.scala
@@ -5,7 +5,7 @@ import scala.collection.immutable.Queue
 
 import cats.laws.discipline.{CoflatMapTests, MonadTests, AlternativeTests, SerializableTests, TraverseTests, SemigroupalTests}
 
-class QueueTests extends CatsSuite {
+class QueueSuite extends CatsSuite {
   checkAll("Queue[Int]", SemigroupalTests[Queue].semigroupal[Int, Int, Int])
   checkAll("Semigroupal[Queue]", SerializableTests.serializable(Semigroupal[Queue]))
 
diff --git a/tests/src/test/scala/cats/tests/ReducibleTests.scala b/tests/src/test/scala/cats/tests/ReducibleSuite.scala
similarity index 96%
rename from tests/src/test/scala/cats/tests/ReducibleTests.scala
rename to tests/src/test/scala/cats/tests/ReducibleSuite.scala
index 74e4ee5148..a92fdd25b5 100644
--- a/tests/src/test/scala/cats/tests/ReducibleTests.scala
+++ b/tests/src/test/scala/cats/tests/ReducibleSuite.scala
@@ -5,7 +5,7 @@ import org.scalacheck.Arbitrary
 
 import cats.data.NonEmptyList
 
-class ReducibleTestsAdditional extends CatsSuite {
+class ReducibleSuiteAdditional extends CatsSuite {
 
   test("Reducible[NonEmptyList].reduceLeftM stack safety") {
     def nonzero(acc: Long, x: Long): Option[Long] =
@@ -71,7 +71,7 @@ class ReducibleTestsAdditional extends CatsSuite {
 
 }
 
-abstract class ReducibleCheck[F[_]: Reducible](name: String)(implicit ArbFInt: Arbitrary[F[Int]], ArbFString: Arbitrary[F[String]]) extends FoldableCheck[F](name) {
+abstract class ReducibleSuite[F[_]: Reducible](name: String)(implicit ArbFInt: Arbitrary[F[Int]], ArbFString: Arbitrary[F[String]]) extends FoldableSuite[F](name) {
   def range(start: Long, endInclusive: Long): F[Long]
 
   test(s"Reducible[$name].reduceLeftM stack safety") {
diff --git a/tests/src/test/scala/cats/tests/RegressionTests.scala b/tests/src/test/scala/cats/tests/RegressionSuite.scala
similarity index 99%
rename from tests/src/test/scala/cats/tests/RegressionTests.scala
rename to tests/src/test/scala/cats/tests/RegressionSuite.scala
index be197e087b..e62c5f9df3 100644
--- a/tests/src/test/scala/cats/tests/RegressionTests.scala
+++ b/tests/src/test/scala/cats/tests/RegressionSuite.scala
@@ -4,7 +4,7 @@ package tests
 import cats.data.{Const, NonEmptyList}
 
 import scala.collection.mutable
-class RegressionTests extends CatsSuite {
+class RegressionSuite extends CatsSuite {
 
   // toy state class
   // not stack safe, very minimal, not for actual use
diff --git a/tests/src/test/scala/cats/tests/SemigroupTests.scala b/tests/src/test/scala/cats/tests/SemigroupSuite.scala
similarity index 88%
rename from tests/src/test/scala/cats/tests/SemigroupTests.scala
rename to tests/src/test/scala/cats/tests/SemigroupSuite.scala
index 1f536b5ae5..c33fd27ca8 100644
--- a/tests/src/test/scala/cats/tests/SemigroupTests.scala
+++ b/tests/src/test/scala/cats/tests/SemigroupSuite.scala
@@ -5,7 +5,7 @@ import org.scalatest._
 
 
 
-class SemigroupTests extends FunSuite {
+class SemigroupSuite extends FunSuite {
   {
     import cats.implicits._
     Invariant[Semigroup]
diff --git a/tests/src/test/scala/cats/tests/SetTests.scala b/tests/src/test/scala/cats/tests/SetSuite.scala
similarity index 97%
rename from tests/src/test/scala/cats/tests/SetTests.scala
rename to tests/src/test/scala/cats/tests/SetSuite.scala
index 2703f6ec5a..cbf01b11a5 100644
--- a/tests/src/test/scala/cats/tests/SetTests.scala
+++ b/tests/src/test/scala/cats/tests/SetSuite.scala
@@ -3,7 +3,7 @@ package tests
 
 import cats.laws.discipline.{FoldableTests, MonoidKTests, SerializableTests}
 import cats.kernel.laws.discipline.{MonoidTests => MonoidLawTests}
-class SetTests extends CatsSuite {
+class SetSuite extends CatsSuite {
   checkAll("Set[Int]", MonoidLawTests[Set[Int]].monoid)
 
   checkAll("Set[Int]", MonoidKTests[Set].monoidK[Int])
diff --git a/tests/src/test/scala/cats/tests/ShowTests.scala b/tests/src/test/scala/cats/tests/ShowSuite.scala
similarity index 96%
rename from tests/src/test/scala/cats/tests/ShowTests.scala
rename to tests/src/test/scala/cats/tests/ShowSuite.scala
index 3d437f0438..99d1997ba0 100644
--- a/tests/src/test/scala/cats/tests/ShowTests.scala
+++ b/tests/src/test/scala/cats/tests/ShowSuite.scala
@@ -6,7 +6,7 @@ import cats.laws.discipline.arbitrary._
 import cats.laws.discipline.{ContravariantTests, SerializableTests}
 import cats.laws.discipline.eq._
 
-class ShowTests extends CatsSuite {
+class ShowSuite extends CatsSuite {
   checkAll("Contravariant[Show]", ContravariantTests[Show].contravariant[Int, Int, Int])
   checkAll("Contravariant[Show]", SerializableTests.serializable(Contravariant[Show]))
 
diff --git a/tests/src/test/scala/cats/tests/SplitTest.scala b/tests/src/test/scala/cats/tests/SplitSuite.scala
similarity index 78%
rename from tests/src/test/scala/cats/tests/SplitTest.scala
rename to tests/src/test/scala/cats/tests/SplitSuite.scala
index 3cc5af0d83..f68bfe723d 100644
--- a/tests/src/test/scala/cats/tests/SplitTest.scala
+++ b/tests/src/test/scala/cats/tests/SplitSuite.scala
@@ -1,7 +1,7 @@
 package cats
 package tests
 
-class SplitTest extends CatsSuite {
+class SplitSuite extends CatsSuite {
   test("syntax") {
     val f = (((_: Int) + 1) split ((_: Int) / 2))
     f((1, 2)) should be((2, 1))
diff --git a/tests/src/test/scala/cats/tests/StreamTests.scala b/tests/src/test/scala/cats/tests/StreamSuite.scala
similarity index 97%
rename from tests/src/test/scala/cats/tests/StreamTests.scala
rename to tests/src/test/scala/cats/tests/StreamSuite.scala
index 971fde07c8..648f114f6e 100644
--- a/tests/src/test/scala/cats/tests/StreamTests.scala
+++ b/tests/src/test/scala/cats/tests/StreamSuite.scala
@@ -3,7 +3,7 @@ package tests
 
 import cats.laws.discipline.{CoflatMapTests, MonadTests, AlternativeTests, SerializableTests, TraverseTests, SemigroupalTests}
 
-class StreamTests extends CatsSuite {
+class StreamSuite extends CatsSuite {
   checkAll("Stream[Int]", SemigroupalTests[Stream].semigroupal[Int, Int, Int])
   checkAll("Semigroupal[Stream]", SerializableTests.serializable(Semigroupal[Stream]))
 
diff --git a/tests/src/test/scala/cats/tests/SyntaxTests.scala b/tests/src/test/scala/cats/tests/SyntaxSuite.scala
similarity index 99%
rename from tests/src/test/scala/cats/tests/SyntaxTests.scala
rename to tests/src/test/scala/cats/tests/SyntaxSuite.scala
index 1bb81c456b..05c8d40fcf 100644
--- a/tests/src/test/scala/cats/tests/SyntaxTests.scala
+++ b/tests/src/test/scala/cats/tests/SyntaxSuite.scala
@@ -24,7 +24,7 @@ import cats.syntax.AllSyntax
  *
  * None of these tests should ever run, or do any runtime checks.
  */
-object SyntaxTests extends AllInstances with AllSyntax {
+object SyntaxSuite extends AllInstances with AllSyntax {
 
   // pretend we have a value of type A
   def mock[A]: A = ???
diff --git a/tests/src/test/scala/cats/tests/TraverseTests.scala b/tests/src/test/scala/cats/tests/TraverseSuite.scala
similarity index 78%
rename from tests/src/test/scala/cats/tests/TraverseTests.scala
rename to tests/src/test/scala/cats/tests/TraverseSuite.scala
index de48c339a1..b912201a9b 100644
--- a/tests/src/test/scala/cats/tests/TraverseTests.scala
+++ b/tests/src/test/scala/cats/tests/TraverseSuite.scala
@@ -6,7 +6,7 @@ import org.scalacheck.Arbitrary
 
 import cats.instances.all._
 
-abstract class TraverseCheck[F[_]: Traverse](name: String)(implicit ArbFInt: Arbitrary[F[Int]]) extends CatsSuite with PropertyChecks {
+abstract class TraverseSuite[F[_]: Traverse](name: String)(implicit ArbFInt: Arbitrary[F[Int]]) extends CatsSuite with PropertyChecks {
 
   test(s"Traverse[$name].zipWithIndex") {
     forAll { (fa: F[Int]) =>
@@ -30,10 +30,10 @@ abstract class TraverseCheck[F[_]: Traverse](name: String)(implicit ArbFInt: Arb
 
 }
 
-object TraverseCheck {
+object TraverseSuite {
   // forces testing of the underlying implementation (avoids overridden methods)
   abstract class Underlying[F[_]: Traverse](name: String)(implicit ArbFInt: Arbitrary[F[Int]])
-      extends TraverseCheck(s"$name (underlying)")(proxyTraverse[F], ArbFInt)
+      extends TraverseSuite(s"$name (underlying)")(proxyTraverse[F], ArbFInt)
 
   // proxies a traverse instance so we can test default implementations
   // to achieve coverage using default datatype instances
@@ -47,15 +47,15 @@ object TraverseCheck {
   }
 }
 
-class TraverseListCheck   extends TraverseCheck[List]("List")
-class TraverseStreamCheck extends TraverseCheck[Stream]("Stream")
-class TraverseVectorCheck extends TraverseCheck[Vector]("Vector")
+class TraverseListSuite   extends TraverseSuite[List]("List")
+class TraverseStreamSuite extends TraverseSuite[Stream]("Stream")
+class TraverseVectorSuite extends TraverseSuite[Vector]("Vector")
 
-class TraverseListCheckUnderlying   extends TraverseCheck.Underlying[List]("List")
-class TraverseStreamCheckUnderlying extends TraverseCheck.Underlying[Stream]("Stream")
-class TraverseVectorCheckUnderlying extends TraverseCheck.Underlying[Vector]("Vector")
+class TraverseListSuiteUnderlying   extends TraverseSuite.Underlying[List]("List")
+class TraverseStreamSuiteUnderlying extends TraverseSuite.Underlying[Stream]("Stream")
+class TraverseVectorSuiteUnderlying extends TraverseSuite.Underlying[Vector]("Vector")
 
-class TraverseTestsAdditional extends CatsSuite {
+class TraverseSuiteAdditional extends CatsSuite {
 
   def checkZipWithIndexedStackSafety[F[_]](fromRange: Range => F[Int])(implicit F: Traverse[F]): Unit = {
     F.zipWithIndex(fromRange(1 to 70000))
diff --git a/tests/src/test/scala/cats/tests/TryTests.scala b/tests/src/test/scala/cats/tests/TrySuite.scala
similarity index 99%
rename from tests/src/test/scala/cats/tests/TryTests.scala
rename to tests/src/test/scala/cats/tests/TrySuite.scala
index 38e7a3fe37..b6c10eb011 100644
--- a/tests/src/test/scala/cats/tests/TryTests.scala
+++ b/tests/src/test/scala/cats/tests/TrySuite.scala
@@ -11,7 +11,7 @@ import cats.laws.discipline.arbitrary._
 
 import scala.util.{Success, Try}
 
-class TryTests extends CatsSuite {
+class TrySuite extends CatsSuite {
   implicit val eqThrow: Eq[Throwable] = Eq.allEqual
 
   checkAll("Try[Int]", SemigroupalTests[Try].semigroupal[Int, Int, Int])
diff --git a/tests/src/test/scala/cats/tests/Tuple2KTests.scala b/tests/src/test/scala/cats/tests/Tuple2KSuite.scala
similarity index 99%
rename from tests/src/test/scala/cats/tests/Tuple2KTests.scala
rename to tests/src/test/scala/cats/tests/Tuple2KSuite.scala
index be19e385ba..bb810073c9 100644
--- a/tests/src/test/scala/cats/tests/Tuple2KTests.scala
+++ b/tests/src/test/scala/cats/tests/Tuple2KSuite.scala
@@ -12,7 +12,7 @@ import cats.kernel.laws.discipline.{
   EqTests => EqLawTests
 }
 
-class Tuple2KTests extends CatsSuite {
+class Tuple2KSuite extends CatsSuite {
   implicit val iso = SemigroupalTests.Isomorphisms.invariant[Tuple2K[Option, List, ?]]
   checkAll("Tuple2K[Option, List, Int]", SemigroupalTests[λ[α => Tuple2K[Option, List, α]]].semigroupal[Int, Int, Int])
   checkAll("Semigroupal[Tuple2K[Option, List, Int]]", SerializableTests.serializable(Semigroupal[λ[α => Tuple2K[Option, List, α]]]))
diff --git a/tests/src/test/scala/cats/tests/TupleTests.scala b/tests/src/test/scala/cats/tests/TupleSuite.scala
similarity index 98%
rename from tests/src/test/scala/cats/tests/TupleTests.scala
rename to tests/src/test/scala/cats/tests/TupleSuite.scala
index edf5651323..ad3ebf95b6 100644
--- a/tests/src/test/scala/cats/tests/TupleTests.scala
+++ b/tests/src/test/scala/cats/tests/TupleSuite.scala
@@ -6,7 +6,7 @@ import data.NonEmptyList
 import cats.laws.discipline._
 import cats.laws.discipline.arbitrary._
 
-class TupleTests extends CatsSuite {
+class TupleSuite extends CatsSuite {
 
   implicit val iso1 = SemigroupalTests.Isomorphisms.invariant[(NonEmptyList[Int], ?)]
   implicit val iso2 = SemigroupalTests.Isomorphisms.invariant[(String, ?)]
diff --git a/tests/src/test/scala/cats/tests/ValidatedTests.scala b/tests/src/test/scala/cats/tests/ValidatedSuite.scala
similarity index 99%
rename from tests/src/test/scala/cats/tests/ValidatedTests.scala
rename to tests/src/test/scala/cats/tests/ValidatedSuite.scala
index 194fcb9b46..97ff3c0524 100644
--- a/tests/src/test/scala/cats/tests/ValidatedTests.scala
+++ b/tests/src/test/scala/cats/tests/ValidatedSuite.scala
@@ -17,7 +17,7 @@ import cats.kernel.laws.discipline.{
 
 import scala.util.Try
 
-class ValidatedTests extends CatsSuite {
+class ValidatedSuite extends CatsSuite {
   implicit val iso = SemigroupalTests.Isomorphisms.invariant[Validated[String, ?]]
   checkAll("Validated[String, Int]", SemigroupalTests[Validated[String,?]].semigroupal[Int, Int, Int])
   checkAll("Semigroupal[Validated[String,?]]", SerializableTests.serializable(Semigroupal[Validated[String,?]]))
diff --git a/tests/src/test/scala/cats/tests/VectorTests.scala b/tests/src/test/scala/cats/tests/VectorSuite.scala
similarity index 97%
rename from tests/src/test/scala/cats/tests/VectorTests.scala
rename to tests/src/test/scala/cats/tests/VectorSuite.scala
index ff86fea92b..9c9137cfd5 100644
--- a/tests/src/test/scala/cats/tests/VectorTests.scala
+++ b/tests/src/test/scala/cats/tests/VectorSuite.scala
@@ -5,7 +5,7 @@ import cats.data.NonEmptyVector
 import cats.laws.discipline.{AlternativeTests, CoflatMapTests, SerializableTests, TraverseTests, SemigroupalTests}
 import cats.laws.discipline.arbitrary._
 
-class VectorTests extends CatsSuite {
+class VectorSuite extends CatsSuite {
   checkAll("Vector[Int]", SemigroupalTests[Vector].semigroupal[Int, Int, Int])
   checkAll("Semigroupal[Vector]", SerializableTests.serializable(Semigroupal[Vector]))
 
diff --git a/tests/src/test/scala/cats/tests/WordCountTest.scala b/tests/src/test/scala/cats/tests/WordCountSuite.scala
similarity index 97%
rename from tests/src/test/scala/cats/tests/WordCountTest.scala
rename to tests/src/test/scala/cats/tests/WordCountSuite.scala
index 68831cc378..5acf01142e 100644
--- a/tests/src/test/scala/cats/tests/WordCountTest.scala
+++ b/tests/src/test/scala/cats/tests/WordCountSuite.scala
@@ -8,7 +8,7 @@ import Func.appFunc
  * This an example of applicative function composition.
  * See: [[https://www.cs.ox.ac.uk/jeremy.gibbons/publications/iterator.pdf The Essence of the Iterator Pattern]]
  */
-class WordCountTest extends CatsSuite {
+class WordCountSuite extends CatsSuite {
   test("wordcount") {
     import cats.data.State.{ get, set }
     val text = "Faith, I must leave thee, love, and shortly too.\nMy operant powers their functions leave to do.\n".toList
diff --git a/tests/src/test/scala/cats/tests/WriterTests.scala b/tests/src/test/scala/cats/tests/WriterSuite.scala
similarity index 94%
rename from tests/src/test/scala/cats/tests/WriterTests.scala
rename to tests/src/test/scala/cats/tests/WriterSuite.scala
index 80cd56aa05..c0850c084f 100644
--- a/tests/src/test/scala/cats/tests/WriterTests.scala
+++ b/tests/src/test/scala/cats/tests/WriterSuite.scala
@@ -3,7 +3,7 @@ package tests
 
 import cats.data.Writer
 
-class WriterTests extends CatsSuite {
+class WriterSuite extends CatsSuite {
   test("pure syntax creates a writer with an empty log"){
     forAll { (result: String) =>
       type Logged[A] = Writer[List[Int], A]
diff --git a/tests/src/test/scala/cats/tests/WriterTTests.scala b/tests/src/test/scala/cats/tests/WriterTSuite.scala
similarity index 99%
rename from tests/src/test/scala/cats/tests/WriterTTests.scala
rename to tests/src/test/scala/cats/tests/WriterTSuite.scala
index 9e0d6ccbd8..e546524cb4 100644
--- a/tests/src/test/scala/cats/tests/WriterTTests.scala
+++ b/tests/src/test/scala/cats/tests/WriterTSuite.scala
@@ -13,7 +13,7 @@ import cats.kernel.laws.discipline.{
   EqTests => EqLawTests
 }
 
-class WriterTTests extends CatsSuite {
+class WriterTSuite extends CatsSuite {
   type Logged[A] = Writer[ListWrapper[Int], A]
 
   // we have a lot of generated lists of lists in these tests. We have to tell