diff --git a/UnitTestContrib/data/System/UnitTestContrib.txt b/UnitTestContrib/data/System/UnitTestContrib.txt
index bff2b44e3d..cf0abd73b4 100644
--- a/UnitTestContrib/data/System/UnitTestContrib.txt
+++ b/UnitTestContrib/data/System/UnitTestContrib.txt
@@ -1,11 +1,10 @@
-%META:TOPICINFO{author="ProjectContributor" comment="" date="1590418588" format="1.1" version="1"}%
+%META:TOPICINFO{author="ProjectContributor" date="1651568074" format="1.1" version="1"}%
 %META:TOPICPARENT{name="Contribs"}%
 ---+!! !UnitTestContrib
 <!--
 One line description, required for extensions repository catalog.
-   * Set SHORTDESCRIPTION = Foswiki Unit-Test Framework
 -->
-%SHORTDESCRIPTION%
+%FORMFIELD{"Description"}%
 
 %TOC%
 
@@ -99,22 +98,22 @@ Use the =SeleniumConfigTests= to verify your configuration.
 
 %$INSTALL_INSTRUCTIONS%
 
----++ Contrib Info
+---++ Dependencies
+%$DEPENDENCIES%
 
-Another great Foswiki extension from the <img src="%ATTACHURLPATH%/wikiringlogo20x20.png" alt="WikiRing" /> *WikiRing* - working together to improve your wiki experience!
-
-|  Contrib Author(s) | Crawford Currie http://c-dot.co.uk and test authors |
-|  Copyright | &copy; 2007-2020 Foswiki Contributors |
-|  License | [[http://www.gnu.org/licenses/gpl.html][GPL (Gnu General Public License)]] |
-|  Version | %$VERSION% |
-|  Release | %$RELEASE% | 
-|  Dependencies | %$DEPENDENCIES% |
-|  Contrib Home | http://foswiki.org/Extensions/%TOPIC% |
-|  Support | http://foswiki.org/Support/%TOPIC% |
 
 __Related Topics:__ [[%SYSTEMWEB%.Contribs][Contribs]], %SYSTEMWEB%.DeveloperDocumentationCategory, %SYSTEMWEB%.AdminDocumentationCategory, %SYSTEMWEB%.%WIKIPREFSTOPIC%, %LOCALSITEPREFS%
 
 <!-- Do _not_ attempt to edit this topic; it is auto-generated. Please add comments/questions/remarks to the feedback topic on foswiki.org instead. -->
 
-%META:FILEATTACHMENT{name="logo.gif" attr="h" comment="" date="1590418588" size="16557" user="ProjectContributor" version="1"}%
-%META:FILEATTACHMENT{name="wikiringlogo20x20.png" attr="h" comment="" date="1590418588" size="1343" user="ProjectContributor" version="1"}%
+%META:FORM{name="PackageForm"}%
+%META:FIELD{name="Author" title="Author" value="Crawford Currie http://c-dot.co.uk and test authors"}%
+%META:FIELD{name="Copyright" title="Copyright" value="&copy; 2007-2022 Foswiki Contributors"}%
+%META:FIELD{name="Description" title="Description" value="%25$SHORTDESCRIPTION%25"}%
+%META:FIELD{name="Home" title="Home" value="http://foswiki.org/Extensions/%TOPIC%"}%
+%META:FIELD{name="License" title="License" value="[[http://www.gnu.org/licenses/gpl.html][GPL (Gnu General Public License)]]"}%
+%META:FIELD{name="Release" title="Release" value="%$RELEASE%"}%
+%META:FIELD{name="Repository" title="Repository" value="https://github.com/foswiki/%TOPIC%"}%
+%META:FIELD{name="Support" title="Support" value="http://foswiki.org/Support/%TOPIC%"}%
+%META:FIELD{name="Version" title="Version" value="%$VERSION%"}%
+%META:FILEATTACHMENT{name="logo.gif" attr="h" comment="" date="1651568074" size="16557" user="ProjectContributor" version="1"}%
diff --git a/UnitTestContrib/lib/Foswiki/Contrib/UnitTestContrib/MANIFEST b/UnitTestContrib/lib/Foswiki/Contrib/UnitTestContrib/MANIFEST
index dfad6d9e0b..c6efbd6cdd 100644
--- a/UnitTestContrib/lib/Foswiki/Contrib/UnitTestContrib/MANIFEST
+++ b/UnitTestContrib/lib/Foswiki/Contrib/UnitTestContrib/MANIFEST
@@ -1,3 +1,4 @@
+!noci
 bin/test 0755
 data/System/UnitTestContrib.txt 0644
 lib/Foswiki/Contrib/UnitTestContrib/DEPENDENCIES 0644
@@ -22,7 +23,6 @@ lib/Unit/TestCase.pm 0644
 lib/Unit/TestRunner.pm 0644
 lib/Unit/TestSuite.pm 0644
 pub/System/UnitTestContrib/logo.gif 0644
-pub/System/UnitTestContrib/wikiringlogo20x20.png 0644
 test/bin/TestRunner.pl 0755
 test/unit/AccessControlTests.pm 0644
 test/unit/AddToHeadTests.pm 0644
diff --git a/UnitTestContrib/pub/System/UnitTestContrib/wikiringlogo20x20.png b/UnitTestContrib/pub/System/UnitTestContrib/wikiringlogo20x20.png
deleted file mode 100644
index c126f8c914..0000000000
Binary files a/UnitTestContrib/pub/System/UnitTestContrib/wikiringlogo20x20.png and /dev/null differ