diff --git a/includes/admin/plugin-updates/class-wc-plugin-updates.php b/includes/admin/plugin-updates/class-wc-plugin-updates.php
index ad89f4d2e59..fdb479a2316 100644
--- a/includes/admin/plugin-updates/class-wc-plugin-updates.php
+++ b/includes/admin/plugin-updates/class-wc-plugin-updates.php
@@ -185,6 +185,14 @@ class WC_Plugin_Updates {
 
 		foreach ( $extensions as $file => $plugin ) {
 			$plugin_version_parts = explode( '.', $plugin[ self::VERSION_TESTED_HEADER ] );
+
+			if ( ! is_numeric( $plugin_version_parts[0] )
+				|| ( 'minor' === $release && ! isset( $plugin_version_parts[1] ) )
+				|| ( 'minor' === $release && ! is_numeric( $plugin_version_parts[1] ) )
+				) {
+				continue;
+			}
+
 			$plugin_version = $plugin_version_parts[0];
 
 			if ( 'minor' === $release ) {
@@ -215,6 +223,6 @@ class WC_Plugin_Updates {
 			}
 		}
 
-		return $matches;
+		return apply_filters( 'woocommerce_get_plugins_with_header', $matches, $header, $plugins );
 	}
 }
diff --git a/tests/unit-tests/util/plugin-updates.php b/tests/unit-tests/util/plugin-updates.php
new file mode 100644
index 00000000000..6d9e3364730
--- /dev/null
+++ b/tests/unit-tests/util/plugin-updates.php
@@ -0,0 +1,229 @@
+<?php
+
+/**
+ * Class WC_Plugin_Updates.
+ * @package WooCommerce\Tests\Util
+ * @since 3.2.0
+ */
+class WC_Tests_Plugin_Updates extends WC_Unit_Test_Case {
+
+	/** @var WC_Plugin_Updates instance */
+	protected $updates;
+
+	/** @var array of plugin data for testing*/
+	protected $plugins = array();
+
+	/**
+	 * Setup test.
+	 *
+	 * @since 3.2.0
+	 */
+	public function setUp() {
+		parent::setUp();
+
+		if ( ! class_exists( 'WC_Plugin_Updates' ) ) {
+			$bootstrap = WC_Unit_Tests_Bootstrap::instance();
+			include_once( $bootstrap->plugin_dir . '/includes/admin/plugin-updates/class-wc-plugin-updates.php' );
+		}
+
+		$this->updates = new WC_Plugin_Updates;
+		$this->plugins = array();
+
+		add_filter( 'woocommerce_get_plugins_with_header', array( $this, 'populate_untested_plugins' ), 10, 2 );
+	}
+
+	/**
+	 * Allow this test suite to easily define plugin results to test for the version tested header.
+	 *
+	 * @param array $plugins array of plugin data in same format as get_plugins.
+	 * @param string $header plugin header results matched on.
+	 * @return array modified $plugins.
+	 * @since 3.2.0
+	 */
+	public function populate_untested_plugins( $plugins, $header ) {
+		if ( $this->updates::VERSION_TESTED_HEADER === $header && ! empty( $this->plugins ) ) {
+			$plugins = $this->plugins;
+			update_option( 'active_plugins', array_keys( $this->plugins ) );
+		}
+		return $plugins;
+	}
+
+	/**
+	 * Test WC_Plugin_Updates::get_untested_plugins with a variety of tested plugins for major release.
+	 *
+	 * @since 3.2.0
+	 */
+	public function test_get_untested_plugins_major_good() {
+		$release = 'major';
+
+		$this->plugins = array(
+			'test/test.php' => array(
+				'Name'                                => 'Test plugin',
+				$this->updates::VERSION_TESTED_HEADER => '4.0.0',
+			),
+			'test2/test2.php' => array(
+				'Name'                                => 'Test plugin 2',
+				$this->updates::VERSION_TESTED_HEADER => '5.0',
+			),
+			'test3/test3.php' => array(
+				'Name'                                => 'Test plugin 3',
+				$this->updates::VERSION_TESTED_HEADER => '4.1.0',
+			),
+			'test4/test4.php' => array(
+				'Name'                                => 'Test plugin 4',
+				$this->updates::VERSION_TESTED_HEADER => '4.0.1',
+			),
+		);
+		$new_version = '4.0.0';
+		$this->assertEquals( array(), $this->updates->get_untested_plugins( $new_version, $release, false ) );
+
+		$new_version = '3.9.0';
+		$this->assertEquals( array(), $this->updates->get_untested_plugins( $new_version, $release, false ) );
+
+		$new_version = '4.3.0';
+		$this->assertEquals( array(), $this->updates->get_untested_plugins( $new_version, $release, false ) );
+
+		$new_version = '4.0.2';
+		$this->assertEquals( array(), $this->updates->get_untested_plugins( $new_version, $release ) );
+	}
+
+	/**
+	 * Test WC_Plugin_Updates::get_untested_plugins with a variety of untested plugins for major release.
+	 *
+	 * @since 3.2.0
+	 */
+	public function test_get_untested_plugins_major_bad() {
+		$release = 'major';
+
+		$this->plugins = array(
+			'test/test.php' => array(
+				'Name'                                => 'Test plugin',
+				$this->updates::VERSION_TESTED_HEADER => '3.0.0',
+			),
+			'test2/test2.php' => array(
+				'Name'                                => 'Test plugin 2',
+				$this->updates::VERSION_TESTED_HEADER => '3.9.9',
+			),
+			'test3/test3.php' => array(
+				'Name'                                => 'Test plugin 3',
+				$this->updates::VERSION_TESTED_HEADER => '3.0',
+			),
+		);
+		$new_version = '4.0.0';
+		$this->assertEquals( $this->plugins, $this->updates->get_untested_plugins( $new_version, $release ) );
+
+		$new_version = '4.3.0';
+		$this->assertEquals( $this->plugins, $this->updates->get_untested_plugins( $new_version, $release ) );
+
+		$new_version = '4.0.2';
+		$this->assertEquals( $this->plugins, $this->updates->get_untested_plugins( $new_version, $release ) );
+	}
+
+	/**
+	 * Test WC_Plugin_Updates::get_untested_plugins with a variety of tested plugins for minor release.
+	 *
+	 * @since 3.2.0
+	 */
+	public function test_get_untested_plugins_minor_good() {
+		$release = 'minor';
+
+		$this->plugins = array(
+			'test/test.php' => array(
+				'Name'                                => 'Test plugin',
+				$this->updates::VERSION_TESTED_HEADER => '4.1.0',
+			),
+			'test2/test2.php' => array(
+				'Name'                                => 'Test plugin 2',
+				$this->updates::VERSION_TESTED_HEADER => '5.0.0',
+			),
+			'test3/test3.php' => array(
+				'Name'                                => 'Test plugin 3',
+				$this->updates::VERSION_TESTED_HEADER => '4.1.1',
+			),
+			'test4/test4.php' => array(
+				'Name'                                => 'Test plugin 4',
+				$this->updates::VERSION_TESTED_HEADER => '4.2.1',
+			),
+		);
+		$new_version = '4.1.0';
+		$this->assertEquals( array(), $this->updates->get_untested_plugins( $new_version, $release ) );
+
+		$new_version = '4.2.0';
+		$this->assertEquals( 2, count( $this->updates->get_untested_plugins( $new_version, $release ) ) );
+
+		$new_version = '4.1.5';
+		$this->assertEquals( array(), $this->updates->get_untested_plugins( $new_version, $release ) );
+	}
+
+	/**
+	 * Test WC_Plugin_Updates::get_untested_plugins with a variety of untested plugins for minor release.
+	 *
+	 * @since 3.2.0
+	 */
+	public function test_get_untested_plugins_minor_bad() {
+		$release = 'minor';
+
+		$this->plugins = array(
+			'test/test.php' => array(
+				'Name'                                => 'Test plugin',
+				$this->updates::VERSION_TESTED_HEADER => '4.1.0',
+			),
+			'test2/test2.php' => array(
+				'Name'                                => 'Test plugin 2',
+				$this->updates::VERSION_TESTED_HEADER => '3.9.0',
+			),
+			'test3/test3.php' => array(
+				'Name'                                => 'Test plugin 3',
+				$this->updates::VERSION_TESTED_HEADER => '4.2',
+			),
+		);
+		$new_version = '4.3.0';
+		$this->assertEquals( $this->plugins, $this->updates->get_untested_plugins( $new_version, $release ) );
+
+		$new_version = '4.3.1';
+		$this->assertEquals( $this->plugins, $this->updates->get_untested_plugins( $new_version, $release ) );
+
+		$new_version = '4.1.0';
+		$this->assertEquals( array( 'test2/test2.php' => $this->plugins['test2/test2.php'] ), $this->updates->get_untested_plugins( $new_version, $release ) );
+
+		$new_version = '4.1.5';
+		$this->assertEquals( array( 'test2/test2.php' => $this->plugins['test2/test2.php'] ), $this->updates->get_untested_plugins( $new_version, $release ) );
+	}
+
+	/**
+	 * Test WC_Plugin_Updates::get_untested_plugins with a variety of incorrect values for the header.
+	 * Generally headers with incorrectly formatted values should be ignored, but mostly errors should be avoided.
+	 *
+	 * @since 3.2.0
+	 */
+	public function test_get_untested_plugins_malformed() {
+		$release = 'minor';
+
+		$this->plugins = array(
+			'test/test.php' => array(
+				'Name'                                => 'Test plugin',
+				$this->updates::VERSION_TESTED_HEADER => '4',
+			),
+			'test2/test2.php' => array(
+				'Name'                                => 'Test plugin 2',
+				$this->updates::VERSION_TESTED_HEADER => 'Latest release',
+			),
+			'test3/test3.php' => array(
+				'Name'                                => 'Test plugin 3',
+				$this->updates::VERSION_TESTED_HEADER => 'WC 3.0.0',
+			),
+			'test4/test4.php' => array(
+				'Name'                                => 'Test plugin 4',
+				$this->updates::VERSION_TESTED_HEADER => ' ',
+			),
+		);
+
+		$release = 'major';
+		$new_version = '5.0.0';
+		$this->assertEquals( array( 'test/test.php' => $this->plugins['test/test.php'] ), $this->updates->get_untested_plugins( $new_version, $release ) );
+
+		$release = 'minor';
+		$new_version = '4.1.0';
+		$this->assertEquals( array(), $this->updates->get_untested_plugins( $new_version, $release ) );
+	}
+}