diff --git a/platformio/package/manifest/parser.py b/platformio/package/manifest/parser.py
index 2433e9cb..4028c276 100644
--- a/platformio/package/manifest/parser.py
+++ b/platformio/package/manifest/parser.py
@@ -479,14 +479,13 @@ class LibraryPropertiesManifestParser(BaseManifestParser):
                 homepage=homepage,
                 repository=repository or None,
                 description=self._parse_description(data),
-                platforms=self._parse_platforms(data) or ["*"],
+                platforms=self._parse_platforms(data) or None,
                 keywords=self._parse_keywords(data) or None,
                 export=self._parse_export(),
             )
         )
         if "includes" in data:
             data["headers"] = self.str_to_list(data["includes"], sep=",", unique=True)
-            del data["includes"]
         if "author" in data:
             data["authors"] = self._parse_authors(data)
             for key in ("author", "maintainer"):
diff --git a/tests/package/test_manager.py b/tests/package/test_manager.py
index a42110e9..01bad3df 100644
--- a/tests/package/test_manager.py
+++ b/tests/package/test_manager.py
@@ -199,10 +199,10 @@ def test_install_from_registry(isolated_pio_core, tmpdir_factory):
     # Libraries
     lm = LibraryPackageManager(str(tmpdir_factory.mktemp("lib-storage")))
     # library with dependencies
-    lm.install("AsyncMqttClient-esphome @ 0.8.4", silent=True)
+    lm.install("AsyncMqttClient-esphome @ 0.8.6", silent=True)
     assert len(lm.get_installed()) == 3
     pkg = lm.get_package("AsyncTCP-esphome")
-    assert pkg.metadata.spec.owner == "ottowinter"
+    assert pkg.metadata.spec.owner == "esphome"
     assert not lm.get_package("non-existing-package")
     # mbed library
     assert lm.install("wolfSSL", silent=True)
diff --git a/tests/package/test_manifest.py b/tests/package/test_manifest.py
index 33bbfd95..216adf5d 100644
--- a/tests/package/test_manifest.py
+++ b/tests/package/test_manifest.py
@@ -80,7 +80,6 @@ def test_library_json_parser():
     "keywords": ["sound", "audio", "music", "SD", "card", "playback"],
     "headers": ["include 1.h", "include Space.hpp"],
     "frameworks": "arduino",
-    "platforms": "atmelavr",
     "export": {
         "exclude": "audio_samples"
     },
@@ -100,7 +99,6 @@ def test_library_json_parser():
             "headers": ["include 1.h", "include Space.hpp"],
             "frameworks": ["arduino"],
             "export": {"exclude": ["audio_samples"]},
-            "platforms": ["atmelavr"],
             "dependencies": [
                 {"name": "deps1", "version": "1.0.0"},
                 {
@@ -221,7 +219,6 @@ includes=Arduino.h, Arduino Space.hpp
             "version": "1.2.3",
             "description": "This is Arduino library",
             "sentence": "This is Arduino library",
-            "platforms": ["*"],
             "frameworks": ["arduino"],
             "export": {
                 "exclude": ["extras", "docs", "tests", "test", "*.doxyfile", "*.pdf"]
@@ -233,6 +230,7 @@ includes=Arduino.h, Arduino Space.hpp
             "category": "Signal Input/Output",
             "keywords": ["signal", "input", "output"],
             "headers": ["Arduino.h", "Arduino Space.hpp"],
+            "includes": "Arduino.h, Arduino Space.hpp",
             "customField": "Custom Value",
             "depends": "First Library (=2.0.0), Second Library (>=1.2.0), Third",
             "dependencies": [