diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 8e755fa0..a6716caa 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -108,7 +108,7 @@ spring-security-config = { module = "org.springframework.security:spring-securit
 
 spring-boot-starter-test = { module = "org.springframework.boot:spring-boot-starter-test", version.ref = "spring-boot" }
 
-testcontainers = "org.testcontainers:testcontainers:1.17.5"
+testcontainers = "org.testcontainers:testcontainers:1.21.3"
 testcontainers-ganache = "io.github.ganchix:testcontainers-java-module-ganache:0.0.4"
 
 junit-jupiter = "org.junit.jupiter:junit-jupiter:5.9.1"
diff --git a/src/test/kotlin/io/emeraldpay/dshackle/IntegrationTest.kt b/src/test/kotlin/io/emeraldpay/dshackle/IntegrationTest.kt
index 5617472e..0beb17f6 100644
--- a/src/test/kotlin/io/emeraldpay/dshackle/IntegrationTest.kt
+++ b/src/test/kotlin/io/emeraldpay/dshackle/IntegrationTest.kt
@@ -1,80 +1,91 @@
 package io.emeraldpay.dshackle
 
-import io.emeraldpay.api.proto.BlockchainGrpc
-import io.emeraldpay.api.proto.BlockchainOuterClass
-import io.emeraldpay.api.proto.Common.ChainRef
 import io.emeraldpay.dshackle.config.MainConfig
 import io.emeraldpay.dshackle.config.MainConfigReader
 import io.emeraldpay.dshackle.config.UpstreamsConfig
 import io.emeraldpay.dshackle.foundation.ChainOptions
-import io.github.ganchix.ganache.Account
-import io.github.ganchix.ganache.GanacheContainer
+import io.emeraldpay.dshackle.quorum.BroadcastQuorum
+import io.emeraldpay.dshackle.quorum.MaximumValueQuorum
+import io.emeraldpay.dshackle.reader.BroadcastReader
+import io.emeraldpay.dshackle.reader.RequestReaderFactory
+import io.emeraldpay.dshackle.upstream.MultistreamHolder
+import io.emeraldpay.dshackle.upstream.Selector
 import io.grpc.BindableService
-import io.grpc.inprocess.InProcessChannelBuilder
-import io.grpc.inprocess.InProcessServerBuilder
-import org.assertj.core.api.Assertions
-import org.junit.jupiter.api.BeforeEach
-import org.junit.jupiter.api.Disabled
+import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.Test
+import org.mockito.Mockito.mock
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.boot.test.context.SpringBootTest
 import org.springframework.boot.test.context.TestConfiguration
+import org.springframework.cloud.sleuth.Tracer
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Import
 import org.springframework.context.annotation.Profile
 import org.springframework.test.context.ActiveProfiles
 import org.springframework.util.ResourceUtils
-import java.math.BigInteger
+import org.testcontainers.containers.GenericContainer
 import java.net.URI
 
 @SpringBootTest(properties = ["spring.main.allow-bean-definition-overriding=true"])
 @Import(Config::class)
 @ActiveProfiles("integration-test")
-@Disabled
 class IntegrationTest {
 
     @Autowired
     lateinit var services: List<BindableService>
 
-    lateinit var stub: BlockchainGrpc.BlockchainBlockingStub
+    @Autowired
+    lateinit var multistreamHolder: MultistreamHolder
+
     companion object {
-
-        val PRIVATE_KEY_0 = "ae020c8ddb6fbc24e167b011666639d2ce3d4aa0d9c13d02d726d6865618a781"
-        val PRIVATE_KEY_1 = "81ad1ba5c4da47feb0f0163c0c61a66c4d0e6a66bd839827444b1e3362016140"
-
-        var ganacheContainer: GanacheContainer<*> = GanacheContainer<Nothing>().apply {
-            withAccounts(
-                listOf(
-                    Account.builder().privateKey(PRIVATE_KEY_0).balance(BigInteger.valueOf(2000000000000000000)).build(),
-                    Account.builder().privateKey(PRIVATE_KEY_1).balance(BigInteger.valueOf(2000000000000000000)).build(),
-                ),
+        var ganache: GenericContainer<*> = GenericContainer<Nothing>("trufflesuite/ganache:latest").apply {
+            withExposedPorts(8545)
+            withCommand(
+                "--server.host=0.0.0.0",
+                "--server.port=8545",
+                "--chain.chainId=1",
+                "--chain.networkId=1", // alias: -i=80001
             )
         }
 
         init {
-            ganacheContainer.start()
+            ganache.start()
         }
     }
 
-    @BeforeEach
-    fun prepare() {
-        val serverName = InProcessServerBuilder.generateName()
-        val builder = InProcessServerBuilder.forName(serverName)
-            .directExecutor()
-        services.forEach { builder.addService(it) }
-
-        val managedChannel = InProcessChannelBuilder.forName(serverName).directExecutor().build()
-        val server = builder.build()
-        server.start()
-
-        stub = BlockchainGrpc.newBlockingStub(managedChannel)
-    }
-
     @Test
-    fun test() {
-        val result = stub.describe(BlockchainOuterClass.DescribeRequest.newBuilder().build())
-        Assertions.assertThat(result.chainsCount).isEqualTo(1)
-        Assertions.assertThat(result.chainsList[0].chain).isEqualTo(ChainRef.CHAIN_ETHEREUM__MAINNET)
+    fun testUpstreamTxMethodQuorumAndReader() {
+        val ms = multistreamHolder.getUpstream(Chain.ETHEREUM__MAINNET)
+        val ethUpstream = ms.getUpstreams()[0]
+        val tracer = mock<Tracer>()
+        val reqReader = RequestReaderFactory.default()
+
+        val txQuorum = ethUpstream.getMethods().createQuorumFor("eth_sendRawTransaction")
+        val txCountQuorum = ethUpstream.getMethods().createQuorumFor("eth_getTransactionCount")
+
+        val txReader = reqReader.create(
+            RequestReaderFactory.ReaderData(
+                ms,
+                Selector.UpstreamFilter.default,
+                txQuorum,
+                null,
+                tracer,
+            ),
+        )
+        val txCountReader = reqReader.create(
+            RequestReaderFactory.ReaderData(
+                ms,
+                Selector.UpstreamFilter.default,
+                txCountQuorum,
+                null,
+                tracer,
+            ),
+        )
+
+        assertThat(txQuorum).isInstanceOf(BroadcastQuorum::class.java)
+        assertThat(txCountQuorum).isInstanceOf(MaximumValueQuorum::class.java)
+        assertThat(txReader).isInstanceOf(BroadcastReader::class.java)
+        assertThat(txCountReader).isInstanceOf(BroadcastReader::class.java)
     }
 
     @TestConfiguration
@@ -105,7 +116,7 @@ class IntegrationTest {
                         execution = UpstreamsConfig.RpcConnection().apply {
                             rpc = UpstreamsConfig.HttpEndpoint(
                                 URI.create(
-                                    "http://" + ganacheContainer.getHost() + ":" + ganacheContainer.getMappedPort(8545) + "/",
+                                    "http://" + ganache.host + ":" + ganache.getMappedPort(8545) + "/",
                                 ),
                             )
                         }