diff --git a/classes/class-pmpro-addons.php b/classes/class-pmpro-addons.php
index 0686289e27..597b106d67 100644
--- a/classes/class-pmpro-addons.php
+++ b/classes/class-pmpro-addons.php
@@ -1183,6 +1183,14 @@ private function get_plugin_API_object_from_addon( $addon ) {
 		$api->download_link  = isset( $addon['Download'] ) ? $addon['Download'] : '';
 		$api->package        = isset( $addon['Download'] ) ? $addon['Download'] : '';
 
+		// Automatically update the "Tested Up To" version for any point WP release - like .org does.
+		$wp_version = get_bloginfo( 'version' );
+		$parts = explode( '.', $wp_version, 3 );
+		$trimmed_wp_version = $parts[0] . '.' . $parts[1];
+		if ( version_compare( $api->tested, $trimmed_wp_version, '>=' ) ) {
+			$api->tested = $wp_version;
+		}
+		
 		// add sections
 		if ( ! empty( $addon['Description'] ) ) {
 			$api->sections['description'] = $addon['Description'];