diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 70687fd2c7..96aa2fb1d9 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -147,6 +147,14 @@ If your contribution is adding a new dependency, please detail:
 Contributions that add new dependencies may take longer to approve because a detailed audit of the
 dependency may be required.
 
+### Testing
+
+Your code should be tested. We use ScalaTest as a testing framework.
+
+ScalaTest's approach is to parallelize on test suites rather than individual tests, therefore it is
+recommended to keep the execution time of each test suite under one minute and split tests across
+multiple smaller suites if needed.
+
 ### IntelliJ Tips
 
 If you're using [IntelliJ](https://www.jetbrains.com/idea/), here are some useful commands:
diff --git a/eclair-core/src/test/scala/fr/acinq/eclair/channel/states/ChannelStateTestsHelperMethods.scala b/eclair-core/src/test/scala/fr/acinq/eclair/channel/states/ChannelStateTestsHelperMethods.scala
index d7364eba51..cbffd9cc3a 100644
--- a/eclair-core/src/test/scala/fr/acinq/eclair/channel/states/ChannelStateTestsHelperMethods.scala
+++ b/eclair-core/src/test/scala/fr/acinq/eclair/channel/states/ChannelStateTestsHelperMethods.scala
@@ -20,9 +20,9 @@ import akka.actor.typed.scaladsl.adapter.actorRefAdapter
 import akka.actor.{ActorContext, ActorRef}
 import akka.testkit.{TestFSMRef, TestKitBase, TestProbe}
 import com.softwaremill.quicklens.ModifyPimp
+import fr.acinq.bitcoin.ScriptFlags
 import fr.acinq.bitcoin.scalacompat.Crypto.PublicKey
 import fr.acinq.bitcoin.scalacompat.{ByteVector32, Crypto, SatoshiLong, Transaction}
-import fr.acinq.bitcoin.ScriptFlags
 import fr.acinq.eclair.TestConstants.{Alice, Bob}
 import fr.acinq.eclair._
 import fr.acinq.eclair.blockchain.bitcoind.ZmqWatcher._
@@ -39,7 +39,7 @@ import fr.acinq.eclair.router.Router.ChannelHop
 import fr.acinq.eclair.transactions.Transactions
 import fr.acinq.eclair.transactions.Transactions._
 import fr.acinq.eclair.wire.protocol._
-import org.scalatest.{FixtureTestSuite, ParallelTestExecution}
+import org.scalatest.FixtureTestSuite
 
 import java.util.UUID
 import scala.concurrent.duration._
@@ -47,7 +47,7 @@ import scala.concurrent.duration._
 /**
  * Created by PM on 23/08/2016.
  */
-trait ChannelStateTestsBase extends ChannelStateTestsHelperMethods with FixtureTestSuite with ParallelTestExecution {
+trait ChannelStateTestsBase extends ChannelStateTestsHelperMethods with FixtureTestSuite {
 
   implicit class ChannelWithTestFeeConf(a: TestFSMRef[ChannelState, ChannelData, Channel]) {
     // @formatter:off