diff --git a/package.xml b/package.xml
index 7dd5e42..7452e51 100644
--- a/package.xml
+++ b/package.xml
@@ -145,7 +145,6 @@
     <file role="test" name="produce_consume.phpt"/>
     <file role="test" name="produce_consume_queue.phpt"/>
     <file role="test" name="produce_consume_transactional.phpt"/>
-    <file role="test" name="produce_opaque_noconf.phpt"/>
     <file role="test" name="produce_opaque_noflush_dr_callback.phpt"/>
     <file role="test" name="produce_opaque_noflush.phpt"/>
     <file role="test" name="produce_opaque.phpt"/>
diff --git a/tests/bug115.phpt b/tests/bug115.phpt
index 8c1620d..1764cc2 100644
--- a/tests/bug115.phpt
+++ b/tests/bug115.phpt
@@ -10,7 +10,7 @@ require __DIR__ . '/integration-tests-check.php';
 $delivered = 0;
 
 $conf = new RdKafka\Conf();
-if (RD_KAFKA_VERSION >= 0x090000 && false !== getenv('TEST_KAFKA_BROKER_VERSION')) {
+if (false !== getenv('TEST_KAFKA_BROKER_VERSION')) {
     $conf->set('broker.version.fallback', getenv('TEST_KAFKA_BROKER_VERSION'));
 }
 $conf->setErrorCb(function ($producer, $err, $errstr) {
diff --git a/tests/bug465.phpt b/tests/bug465.phpt
index 68f3f10..128c400 100644
--- a/tests/bug465.phpt
+++ b/tests/bug465.phpt
@@ -18,7 +18,7 @@ var_dump($n > 0);
 
 function getTopics() {
     $conf = new RdKafka\Conf();
-    if (RD_KAFKA_VERSION >= 0x090000 && false !== getenv('TEST_KAFKA_BROKER_VERSION')) {
+    if (false !== getenv('TEST_KAFKA_BROKER_VERSION')) {
         $conf->set('broker.version.fallback', getenv('TEST_KAFKA_BROKER_VERSION'));
     }
     $conf->set('metadata.broker.list', getenv('TEST_KAFKA_BROKERS'));
diff --git a/tests/conf_callbacks.phpt b/tests/conf_callbacks.phpt
index fd5e881..d9d4720 100644
--- a/tests/conf_callbacks.phpt
+++ b/tests/conf_callbacks.phpt
@@ -1,8 +1,5 @@
 --TEST--
 RdKafka\Conf
---SKIPIF--
-<?php
-(RD_KAFKA_VERSION >= 0x090000 && RD_KAFKA_VERSION < 0x010100ff) || die("skip librdkafka too old");
 --FILE--
 <?php
 
diff --git a/tests/conf_callbacks_integration.phpt b/tests/conf_callbacks_integration.phpt
index 004901d..dc88f73 100644
--- a/tests/conf_callbacks_integration.phpt
+++ b/tests/conf_callbacks_integration.phpt
@@ -2,7 +2,6 @@
 RdKafka\Conf
 --SKIPIF--
 <?php
-RD_KAFKA_VERSION >= 0x090000 || die("skip librdkafka too old");
 (!isset($_ENV['TESTS_DONT_SKIP_RISKY']) || $_ENV['TESTS_DONT_SKIP_RISKY']) && die("skip Risky/broken test");
 require __DIR__ . '/integration-tests-check.php';
 --FILE--
diff --git a/tests/conf_callbacks_rdkafka11.phpt b/tests/conf_callbacks_rdkafka11.phpt
index 1e7b72f..cc2d063 100644
--- a/tests/conf_callbacks_rdkafka11.phpt
+++ b/tests/conf_callbacks_rdkafka11.phpt
@@ -1,8 +1,5 @@
 --TEST--
 RdKafka\Conf
---SKIPIF--
-<?php
-RD_KAFKA_VERSION >= 0x010100ff || die("skip librdkafka too old");
 --FILE--
 <?php
 
diff --git a/tests/conf_setDefaultTopicConf.phpt b/tests/conf_setDefaultTopicConf.phpt
index ad08f3b..afc38f9 100644
--- a/tests/conf_setDefaultTopicConf.phpt
+++ b/tests/conf_setDefaultTopicConf.phpt
@@ -1,11 +1,5 @@
 --TEST--
 RdKafka\Conf::setDefaultTopicConf()
---SKIPIF--
-<?php
-if (!method_exists('RdKafka\Conf', 'setDefaultTopicConf') || 7 < PHP_MAJOR_VERSION) {
-    echo "skip";
-}
-?>
 --FILE--
 <?php
 
diff --git a/tests/controller_id.phpt b/tests/controller_id.phpt
index b972480..f8a793a 100644
--- a/tests/controller_id.phpt
+++ b/tests/controller_id.phpt
@@ -3,7 +3,7 @@ Display controller id
 --SKIPIF--
 <?php
 require __DIR__ . '/integration-tests-check.php';
-RD_KAFKA_BUILD_VERSION < 0x010000ff && die("skip librdkafka < 1.0.0");
+?>
 --FILE--
 <?php
 require __DIR__ . '/integration-tests-check.php';
@@ -22,4 +22,4 @@ echo (new RdKafka\KafkaConsumer($conf))->getControllerId(10*1000) . \PHP_EOL;
 --EXPECT--
 1
 1
-1
\ No newline at end of file
+1
diff --git a/tests/init_transaction_not_configured.phpt b/tests/init_transaction_not_configured.phpt
index e0a28f3..e7b2d59 100644
--- a/tests/init_transaction_not_configured.phpt
+++ b/tests/init_transaction_not_configured.phpt
@@ -11,7 +11,7 @@ if (!class_exists("RdKafka\\KafkaErrorException")) {
 require __DIR__ . '/integration-tests-check.php';
 
 $conf = new RdKafka\Conf();
-if (RD_KAFKA_VERSION >= 0x090000 && false !== getenv('TEST_KAFKA_BROKER_VERSION')) {
+if (false !== getenv('TEST_KAFKA_BROKER_VERSION')) {
     $conf->set('broker.version.fallback', getenv('TEST_KAFKA_BROKER_VERSION'));
 }
 
diff --git a/tests/message_headers.phpt b/tests/message_headers.phpt
index eaf0078..17e9d92 100644
--- a/tests/message_headers.phpt
+++ b/tests/message_headers.phpt
@@ -2,8 +2,8 @@
 Message headers
 --SKIPIF--
 <?php
-RD_KAFKA_VERSION >= 0x000b04ff || die("skip librdkafka too old");
 require __DIR__ . '/integration-tests-check.php';
+?>
 --FILE--
 <?php
 require __DIR__ . '/integration-tests-check.php';
diff --git a/tests/oauthbearer_integration.phpt b/tests/oauthbearer_integration.phpt
index b95de0f..036d229 100644
--- a/tests/oauthbearer_integration.phpt
+++ b/tests/oauthbearer_integration.phpt
@@ -3,7 +3,7 @@ Oauthbearer
 --SKIPIF--
 <?php
 require __DIR__ . '/integration-tests-check.php';
-RD_KAFKA_VERSION >= 0x01010000 || die("skip librdkafka too old does not support oauthbearer");
+?>
 --FILE--
 <?php
 require __DIR__ . '/integration-tests-check.php';
@@ -37,7 +37,7 @@ function generateJws($scope = 'required-scope', $expiresInSeconds = 60)
 
 // Set up tests
 $conf = new RdKafka\Conf();
-if (RD_KAFKA_VERSION >= 0x090000 && false !== getenv('TEST_KAFKA_BROKER_VERSION')) {
+if (false !== getenv('TEST_KAFKA_BROKER_VERSION')) {
     $conf->set('broker.version.fallback', getenv('TEST_KAFKA_BROKER_VERSION'));
 }
 $conf->set('metadata.broker.list', getenv('TEST_KAFKA_OAUTH_BROKERS'));
diff --git a/tests/produce_consume.phpt b/tests/produce_consume.phpt
index 0782109..b11a162 100644
--- a/tests/produce_consume.phpt
+++ b/tests/produce_consume.phpt
@@ -10,7 +10,7 @@ require __DIR__ . '/integration-tests-check.php';
 $delivered = 0;
 
 $conf = new RdKafka\Conf();
-if (RD_KAFKA_VERSION >= 0x090000 && false !== getenv('TEST_KAFKA_BROKER_VERSION')) {
+if (false !== getenv('TEST_KAFKA_BROKER_VERSION')) {
     $conf->set('broker.version.fallback', getenv('TEST_KAFKA_BROKER_VERSION'));
 }
 $conf->setErrorCb(function ($producer, $err, $errstr) {
diff --git a/tests/produce_consume_queue.phpt b/tests/produce_consume_queue.phpt
index ff11984..112fa13 100644
--- a/tests/produce_consume_queue.phpt
+++ b/tests/produce_consume_queue.phpt
@@ -10,7 +10,7 @@ require __DIR__ . '/integration-tests-check.php';
 $delivered = 0;
 
 $conf = new RdKafka\Conf();
-if (RD_KAFKA_VERSION >= 0x090000 && false !== getenv('TEST_KAFKA_BROKER_VERSION')) {
+if (false !== getenv('TEST_KAFKA_BROKER_VERSION')) {
     $conf->set('broker.version.fallback', getenv('TEST_KAFKA_BROKER_VERSION'));
 }
 $conf->setErrorCb(function ($producer, $err, $errstr) {
@@ -54,7 +54,7 @@ printf("%d messages delivered\n", $delivered);
 $conf = new RdKafka\Conf();
 // Required to detect actual reaching of partition EOF for both topics
 $conf->set('enable.partition.eof', 'true');
-if (RD_KAFKA_VERSION >= 0x090000 && false !== getenv('TEST_KAFKA_BROKER_VERSION')) {
+if (false !== getenv('TEST_KAFKA_BROKER_VERSION')) {
     $conf->set('broker.version.fallback', getenv('TEST_KAFKA_BROKER_VERSION'));
 }
 $conf->setErrorCb(function ($producer, $err, $errstr) {
diff --git a/tests/produce_consume_transactional.phpt b/tests/produce_consume_transactional.phpt
index 48d2545..805446a 100644
--- a/tests/produce_consume_transactional.phpt
+++ b/tests/produce_consume_transactional.phpt
@@ -14,7 +14,7 @@ $delivered = 0;
 
 $conf = new RdKafka\Conf();
 $conf->set('transactional.id', 'transactional-producer');
-if (RD_KAFKA_VERSION >= 0x090000 && false !== getenv('TEST_KAFKA_BROKER_VERSION')) {
+if (false !== getenv('TEST_KAFKA_BROKER_VERSION')) {
     $conf->set('broker.version.fallback', getenv('TEST_KAFKA_BROKER_VERSION'));
 }
 $conf->setLogCb(function ($kafka, $level, $facility, $message) {});
diff --git a/tests/produce_opaque.phpt b/tests/produce_opaque.phpt
index 8c37399..3eea8b7 100644
--- a/tests/produce_opaque.phpt
+++ b/tests/produce_opaque.phpt
@@ -3,13 +3,13 @@ Produce with opaque
 --SKIPIF--
 <?php
 require __DIR__ . '/integration-tests-check.php';
-RD_KAFKA_BUILD_VERSION < 0x1000000 && die("skip librdkafka < 1.0.0");
+?>
 --FILE--
 <?php
 require __DIR__ . '/integration-tests-check.php';
 
 $conf = new RdKafka\Conf();
-if (RD_KAFKA_VERSION >= 0x090000 && false !== getenv('TEST_KAFKA_BROKER_VERSION')) {
+if (false !== getenv('TEST_KAFKA_BROKER_VERSION')) {
     $conf->set('broker.version.fallback', getenv('TEST_KAFKA_BROKER_VERSION'));
 }
 $conf->set('metadata.broker.list', getenv('TEST_KAFKA_BROKERS'));
diff --git a/tests/produce_opaque_noconf.phpt b/tests/produce_opaque_noconf.phpt
deleted file mode 100644
index 4ebaeb5..0000000
--- a/tests/produce_opaque_noconf.phpt
+++ /dev/null
@@ -1,30 +0,0 @@
---TEST--
-Produce with opaque, no conf
---SKIPIF--
-<?php
-require __DIR__ . '/integration-tests-check.php';
-RD_KAFKA_BUILD_VERSION < 0x1000000 && die("skip librdkafka < 1.0.0");
-RD_KAFKA_BUILD_VERSION >= 0x1050000 && die("skip librdkafka >= 1.5.0");
---FILE--
-<?php
-require __DIR__ . '/integration-tests-check.php';
-
-$producer = new RdKafka\Producer();
-var_dump($producer->addBrokers(getenv('TEST_KAFKA_BROKERS')));
-
-$topicName = sprintf("test_rdkafka_%s", uniqid());
-
-$topic = $producer->newTopic($topicName);
-
-if (!$producer->getMetadata(false, $topic, 10*1000)) {
-    echo "Failed to get metadata, is broker down?\n";
-}
-
-for ($i = 0; $i < 10; $i++) {
-    $topic->produce(0, 0, "message $i", null, "opaque $i");
-}
-
-echo "Expect no leaks\n";
---EXPECT--
-int(1)
-Expect no leaks
diff --git a/tests/produce_opaque_noflush.phpt b/tests/produce_opaque_noflush.phpt
index 9b3f530..37a2d73 100644
--- a/tests/produce_opaque_noflush.phpt
+++ b/tests/produce_opaque_noflush.phpt
@@ -3,13 +3,13 @@ Produce with opaque, no flush
 --SKIPIF--
 <?php
 require __DIR__ . '/integration-tests-check.php';
-RD_KAFKA_BUILD_VERSION < 0x1000000 && die("skip librdkafka < 1.0.0");
+?>
 --FILE--
 <?php
 require __DIR__ . '/integration-tests-check.php';
 
 $conf = new RdKafka\Conf();
-if (RD_KAFKA_VERSION >= 0x090000 && false !== getenv('TEST_KAFKA_BROKER_VERSION')) {
+if (false !== getenv('TEST_KAFKA_BROKER_VERSION')) {
     $conf->set('broker.version.fallback', getenv('TEST_KAFKA_BROKER_VERSION'));
 }
 $conf->set('metadata.broker.list', getenv('TEST_KAFKA_BROKERS'));
diff --git a/tests/produce_opaque_noflush_dr_callback.phpt b/tests/produce_opaque_noflush_dr_callback.phpt
index f410840..b48c88b 100644
--- a/tests/produce_opaque_noflush_dr_callback.phpt
+++ b/tests/produce_opaque_noflush_dr_callback.phpt
@@ -3,13 +3,13 @@ Produce with opaque, no flush, with delivery callback
 --SKIPIF--
 <?php
 require __DIR__ . '/integration-tests-check.php';
-RD_KAFKA_BUILD_VERSION < 0x1000000 && die("skip librdkafka < 1.0.0");
+?>
 --FILE--
 <?php
 require __DIR__ . '/integration-tests-check.php';
 
 $conf = new RdKafka\Conf();
-if (RD_KAFKA_VERSION >= 0x090000 && false !== getenv('TEST_KAFKA_BROKER_VERSION')) {
+if (false !== getenv('TEST_KAFKA_BROKER_VERSION')) {
     $conf->set('broker.version.fallback', getenv('TEST_KAFKA_BROKER_VERSION'));
 }
 $conf->set('metadata.broker.list', getenv('TEST_KAFKA_BROKERS'));
diff --git a/tests/produce_opaque_purge.phpt b/tests/produce_opaque_purge.phpt
index fe3ab59..7957ac2 100644
--- a/tests/produce_opaque_purge.phpt
+++ b/tests/produce_opaque_purge.phpt
@@ -3,13 +3,13 @@ Produce with opaque, purge queued/inflight messages
 --SKIPIF--
 <?php
 require __DIR__ . '/integration-tests-check.php';
-RD_KAFKA_BUILD_VERSION < 0x1000000 && die("skip librdkafka < 1.0.0");
+?>
 --FILE--
 <?php
 require __DIR__ . '/integration-tests-check.php';
 
 $conf = new RdKafka\Conf();
-if (RD_KAFKA_VERSION >= 0x090000 && false !== getenv('TEST_KAFKA_BROKER_VERSION')) {
+if (false !== getenv('TEST_KAFKA_BROKER_VERSION')) {
     $conf->set('broker.version.fallback', getenv('TEST_KAFKA_BROKER_VERSION'));
 }
 $conf->set('metadata.broker.list', getenv('TEST_KAFKA_BROKERS'));
diff --git a/tests/produce_opaque_purge_dr_callback.phpt b/tests/produce_opaque_purge_dr_callback.phpt
index ff05020..ec3d65a 100644
--- a/tests/produce_opaque_purge_dr_callback.phpt
+++ b/tests/produce_opaque_purge_dr_callback.phpt
@@ -3,13 +3,13 @@ Produce with opaque, purge queued/inflight messages, with delivery callback
 --SKIPIF--
 <?php
 require __DIR__ . '/integration-tests-check.php';
-RD_KAFKA_BUILD_VERSION < 0x1000000 && die("skip librdkafka < 1.0.0");
+?>
 --FILE--
 <?php
 require __DIR__ . '/integration-tests-check.php';
 
 $conf = new RdKafka\Conf();
-if (RD_KAFKA_VERSION >= 0x090000 && false !== getenv('TEST_KAFKA_BROKER_VERSION')) {
+if (false !== getenv('TEST_KAFKA_BROKER_VERSION')) {
     $conf->set('broker.version.fallback', getenv('TEST_KAFKA_BROKER_VERSION'));
 }
 $conf->set('metadata.broker.list', getenv('TEST_KAFKA_BROKERS'));
diff --git a/tests/producev_opaque.phpt b/tests/producev_opaque.phpt
index 6fcc108..85dd32c 100644
--- a/tests/producev_opaque.phpt
+++ b/tests/producev_opaque.phpt
@@ -3,13 +3,13 @@ Producev with opaque
 --SKIPIF--
 <?php
 require __DIR__ . '/integration-tests-check.php';
-RD_KAFKA_BUILD_VERSION < 0x1000000 && die("skip librdkafka < 1.0.0");
+?>
 --FILE--
 <?php
 require __DIR__ . '/integration-tests-check.php';
 
 $conf = new RdKafka\Conf();
-if (RD_KAFKA_VERSION >= 0x090000 && false !== getenv('TEST_KAFKA_BROKER_VERSION')) {
+if (false !== getenv('TEST_KAFKA_BROKER_VERSION')) {
     $conf->set('broker.version.fallback', getenv('TEST_KAFKA_BROKER_VERSION'));
 }
 $conf->set('metadata.broker.list', getenv('TEST_KAFKA_BROKERS'));