diff --git a/api4/plugin_test.go b/api4/plugin_test.go
index eee0d1e5e0..bbb6aaa48f 100644
--- a/api4/plugin_test.go
+++ b/api4/plugin_test.go
@@ -604,7 +604,7 @@ func TestGetInstalledMarketplacePlugins(t *testing.T) {
 
 		expectedPlugins := append(samplePlugins, &model.MarketplacePlugin{
 			BaseMarketplacePlugin: &model.BaseMarketplacePlugin{
-				HomepageURL: "",
+				HomepageURL: "https://example.com/homepage",
 				IconData:    "",
 				DownloadURL: "",
 				Labels: []model.MarketplaceLabel{{
@@ -739,7 +739,7 @@ func TestSearchGetMarketplacePlugins(t *testing.T) {
 
 		plugin1 := &model.MarketplacePlugin{
 			BaseMarketplacePlugin: &model.BaseMarketplacePlugin{
-				HomepageURL: "",
+				HomepageURL: "https://example.com/homepage",
 				IconData:    "",
 				DownloadURL: "",
 				Labels: []model.MarketplaceLabel{{
@@ -756,7 +756,7 @@ func TestSearchGetMarketplacePlugins(t *testing.T) {
 		CheckNoError(t, resp)
 		plugin2 := &model.MarketplacePlugin{
 			BaseMarketplacePlugin: &model.BaseMarketplacePlugin{
-				HomepageURL: "",
+				HomepageURL: "https://example.com/homepage2",
 				IconData:    "",
 				DownloadURL: "",
 				Labels: []model.MarketplaceLabel{{
@@ -898,7 +898,8 @@ func TestGetLocalPluginInMarketplace(t *testing.T) {
 
 		newPlugin := &model.MarketplacePlugin{
 			BaseMarketplacePlugin: &model.BaseMarketplacePlugin{
-				Manifest: manifest,
+				HomepageURL: "https://example.com/homepage",
+				Manifest:    manifest,
 			},
 			InstalledVersion: manifest.Version,
 		}
@@ -931,7 +932,8 @@ func TestGetLocalPluginInMarketplace(t *testing.T) {
 
 		newPlugin := &model.MarketplacePlugin{
 			BaseMarketplacePlugin: &model.BaseMarketplacePlugin{
-				Manifest: manifest,
+				HomepageURL: "https://example.com/homepage",
+				Manifest:    manifest,
 				Labels: []model.MarketplaceLabel{{
 					Name:        "Local",
 					Description: "This plugin is not listed in the marketplace",
diff --git a/app/plugin.go b/app/plugin.go
index 3362e84b32..f6bf9400d7 100644
--- a/app/plugin.go
+++ b/app/plugin.go
@@ -598,8 +598,9 @@ func (a *App) mergeLocalPlugins(remoteMarketplacePlugins map[string]*model.Marke
 
 		remoteMarketplacePlugins[plugin.Manifest.Id] = &model.MarketplacePlugin{
 			BaseMarketplacePlugin: &model.BaseMarketplacePlugin{
-				Labels:   labels,
-				Manifest: plugin.Manifest,
+				HomepageURL: plugin.Manifest.HomepageURL,
+				Labels:      labels,
+				Manifest:    plugin.Manifest,
 			},
 			InstalledVersion: plugin.Manifest.Version,
 		}
diff --git a/tests/README.md b/tests/README.md
index 3ce81fb45f..27b9d185bc 100644
--- a/tests/README.md
+++ b/tests/README.md
@@ -16,3 +16,23 @@ In the text input box in Mattermost, type: `/test url [file-name-in-testing-fold
 
 ## Manual Testing  
 It is possible to manually test specific sections of any test, instead of using the /test command. Do this by clicking **Raw** in the header for the file when it’s open in GitHub, then copy and paste any section into Mattermost to post it. Manual testing only supports sections of 4000 characters or less per post.
+
+## Test plugins
+
+There are two test plugins: `testplugin.tar.gz` and `testplugin2.tar.gz`. These are use in some integration tests in the `api4` package. Any changes to the plugin bundles require updating the coresponding signatures.
+
+First, import the public and privat development key:
+```
+$ gpg --import ./development-public-key.gpg
+$ gpg --import ./development-private-key.asc
+```
+
+This has to be done only once.
+
+Then update the sigantures:
+```
+$ gpg -u F3FACE45E0DE642C8BD6A8E64C7C6562C192CC1F --verbose --personal-digest-preferences SHA256 --detach-sign testplugin.tar.gz
+$ gpg -u F3FACE45E0DE642C8BD6A8E64C7C6562C192CC1F --verbose --personal-digest-preferences SHA256 --detach-sign --armor testplugin.tar.gz
+$ gpg -u F3FACE45E0DE642C8BD6A8E64C7C6562C192CC1F --verbose --personal-digest-preferences SHA256 --detach-sign testplugin2.tar.gz
+
+Finally, include the updates bundles and signatures in your commit.
diff --git a/tests/testplugin.tar.gz b/tests/testplugin.tar.gz
index 2dbbcc2116..b746bd84b0 100644
Binary files a/tests/testplugin.tar.gz and b/tests/testplugin.tar.gz differ
diff --git a/tests/testplugin.tar.gz.asc b/tests/testplugin.tar.gz.asc
index c35e10f169..e171ec3def 100644
--- a/tests/testplugin.tar.gz.asc
+++ b/tests/testplugin.tar.gz.asc
@@ -1,15 +1,14 @@
------BEGIN PGP ARMORED FILE-----
-Comment: Use "gpg --dearmor" for unpacking
+-----BEGIN PGP SIGNATURE-----
 
-iQGzBAABCAAdFiEE8/rOReDeZCyL1qjmTHxlYsGSzB8FAl3vHFQACgkQTHxlYsGS
-zB933gv5AcDL/MW5/fwsLnhWW9plSCbRTMOckt94r0ASOKRzPP7ngEzGtkCFEIGQ
-bN/T60s9uADuIRHEFhmtZvG2MOg9Z688BxiDpyyTx7ENZH0zzPnULEg5hqf7DJqK
-Q8IdPSNE4wk4gvJLdrYIYUkQT4TkQonmBbIHvj3wWKaXTheDnUNp90pOiTszKubK
-ghpAj6ZAlRK60HuMMF7v0RIhqLKYKUGUWvzClKEUZlAKlqTK++FTM0Zot/7KTLDz
-KEv8gf6xe4oL7vSQBoZDa3Vvcn6tPF0gvwg2DrITT3MG2Rmgpbc74iUXWqoZ+XQp
-zf1P+vxbfbyKMYZ4tERlKfwnl6Dbz5vBvlz/U+ZYBmwuw4wD2DvdrecPHj1KcBNy
-2Auap8qhMQcZvYV7D/qnYL8/QU4roQdg4z+G/S0vQTlK5izpzY+/M8ofZHtjDdWD
-cD3w1cvwBFKn9EBJ1HA4/7FEHUzFrh/kWRw2PpUjkydCur2rHqecpRXBqS+Haz7J
-OT9k54ab
-=ywEK
------END PGP ARMORED FILE-----
+iQGzBAABCAAdFiEE8/rOReDeZCyL1qjmTHxlYsGSzB8FAl4hYxIACgkQTHxlYsGS
+zB97wwwAqI1gZQsOg6zsKIPCJ6kQ721rG5EaI/eDseRbKnxaFdcoe2+QzqDXE0Ax
+P5RhZBKr+5hcS4msxjKPPMAVUZeMrhM7pYFV7y1zSkYQkyk8bcfspL3bVbAT4lXA
+x2u2HN6zQqajmX5231hM60ScyIaQXE4aAyruJs4Jw0Cky+NWbXlmo+VVacRxjjp4
+eAodiF+WNuQb0+72qdrvaP/X6PVi/eKe3uv/fWGOKeQUb7yV8WBOcXbyhA7qHY9F
+n2utzLXyu34UBKlkUA7T/RQvFFJCzZAoctR3oN0lPOVdRzRIw0T1WqSxRNbnRgW4
+YPJdKvED7M68HFpdK37SBiMDivseU9I9vOfHRoaQlCK8CYTs1qHPx2hrivj7s5qN
+DStkmzcx1C6OwDt93my3M7WdUHeQ96ryXxFpS9Fj6vYdNTgOE03CW1WIPoNxXJme
+FHu5o9DNr0bNcsye8TNWqoemmM6NlAEdk239NoODwMwtoTia2eufmfMqkgeH8kR8
+BNCgEYSq
+=8YEF
+-----END PGP SIGNATURE-----
diff --git a/tests/testplugin.tar.gz.sig b/tests/testplugin.tar.gz.sig
index 6591ada49c..360c9e0eba 100644
Binary files a/tests/testplugin.tar.gz.sig and b/tests/testplugin.tar.gz.sig differ
diff --git a/tests/testplugin2.tar.gz b/tests/testplugin2.tar.gz
index 635d01dafd..9523f955d6 100644
Binary files a/tests/testplugin2.tar.gz and b/tests/testplugin2.tar.gz differ
diff --git a/tests/testplugin2.tar.gz.sig b/tests/testplugin2.tar.gz.sig
index f530bff762..a8d16b54e2 100644
Binary files a/tests/testplugin2.tar.gz.sig and b/tests/testplugin2.tar.gz.sig differ