diff --git a/BigQuery/tests/System/LoadDataAndQueryTest.php b/BigQuery/tests/System/LoadDataAndQueryTest.php
index bbe21c73e7e4..6f184c51c95a 100644
--- a/BigQuery/tests/System/LoadDataAndQueryTest.php
+++ b/BigQuery/tests/System/LoadDataAndQueryTest.php
@@ -61,8 +61,11 @@ public function set_up()
                 'NextVacation' => self::$client->date(new \DateTime('2020-10-11')),
                 'FavoriteTime' => new \DateTime('1920-01-01 15:15:12')
             ],
-            'FavoriteNumbers' => [new Numeric('.123'), new Numeric('.123')],
-            'BiggerNumbers' => [new BigNumeric('.999999999999999999'), new BigNumeric('343343434343433434343.2')],
+            'FavoriteNumbers' => [new Numeric('0.123'), new Numeric('0.123')],
+            'BiggerNumbers' => [
+                new BigNumeric('0.999999999999999999'),
+                new BigNumeric('343343434343433434343.2')
+            ],
             'Location' => new Geography('POINT(12 34)'),
         ];
         $this->geographyPattern = '/POINT\\s*\\(\\s*12\\s+34\\s*\\)/';
diff --git a/PubSub/composer.json b/PubSub/composer.json
index 7540a76910d5..e24566230696 100644
--- a/PubSub/composer.json
+++ b/PubSub/composer.json
@@ -13,7 +13,8 @@
         "phpspec/prophecy": "^1.10.3",
         "squizlabs/php_codesniffer": "2.*",
         "phpdocumentor/reflection": "^3.0||^4.0",
-        "erusev/parsedown": "^1.6"
+        "erusev/parsedown": "^1.6",
+        "rg/avro-php": "^1.8.0||^2.0.1||^3.0.0"
     },
     "suggest": {
         "ext-grpc": "The gRPC extension enables use of the performant gRPC transport",
diff --git a/PubSub/tests/System/SchemaTest.php b/PubSub/tests/System/SchemaTest.php
index 40611b01a177..ac2c9652964e 100644
--- a/PubSub/tests/System/SchemaTest.php
+++ b/PubSub/tests/System/SchemaTest.php
@@ -116,6 +116,9 @@ public function testSchemaManagementProtobuf(PubSubClient $client)
      */
     public function testPublishWithAvroSchemaBinary(PubSubClient $client)
     {
+        if (version_compare(phpversion(), '7.3.0') === -1) {
+            $this->markTestSkipped('This test can only be run on php 7.3+');
+        }
         $definition = file_get_contents(__DIR__ . '/testdata/schema.avsc');
         $schema = $client->createSchema(
             uniqid(self::TESTING_PREFIX),
diff --git a/composer.json b/composer.json
index ba1c9df760d6..bfe3c5e8ea16 100644
--- a/composer.json
+++ b/composer.json
@@ -69,7 +69,7 @@
         "google/cloud-tools": "^0.13.0",
         "opis/closure": "^3.0",
         "swaggest/json-schema": "^0.12.0",
-        "wikimedia/avro": "^1.9",
+        "rg/avro-php": "^1.8.0||^2.0.1||^3.0.0",
         "symfony/yaml": "^3.3||^6.0"
     },
     "replace": {