diff --git a/src/ModSink.Common.Tests/Models/Group/GroupTests.cs b/src/ModSink.Common.Tests/Models/Group/GroupTests.cs
new file mode 100644
index 00000000..c157222c
--- /dev/null
+++ b/src/ModSink.Common.Tests/Models/Group/GroupTests.cs
@@ -0,0 +1,15 @@
+using System;
+using Bogus;
+
+namespace ModSink.Common.Tests.Models.Group
+{
+    public class GroupTests : TestWithFaker<Common.Models.Group.Group>
+    {
+        public static Faker<Common.Models.Group.Group> GroupFaker = new Faker<Common.Models.Group.Group>()
+            .StrictMode(true)
+            .RuleFor(g => g.BaseUri, f => new Uri(f.Internet.UrlWithPath()))
+            .RuleFor(g => g.RepoInfos, _ => RepoInfoTests.RepoInfoFaker.Generate(3));
+
+        public override Faker<Common.Models.Group.Group> Faker { get; } = GroupFaker;
+    }
+}
\ No newline at end of file
diff --git a/src/ModSink.Common.Tests/Models/Group/RepoInfoTests.cs b/src/ModSink.Common.Tests/Models/Group/RepoInfoTests.cs
new file mode 100644
index 00000000..b5721667
--- /dev/null
+++ b/src/ModSink.Common.Tests/Models/Group/RepoInfoTests.cs
@@ -0,0 +1,14 @@
+using System;
+using Bogus;
+using ModSink.Common.Models.Group;
+
+namespace ModSink.Common.Tests.Models.Group
+{
+    public class RepoInfoTests : TestWithFaker<RepoInfo>
+    {
+        public static Faker<RepoInfo> RepoInfoFaker = new Faker<RepoInfo>().StrictMode(true)
+            .RuleFor(r => r.Uri, f => new Uri(f.Internet.UrlWithPath()));
+
+        public override Faker<RepoInfo> Faker { get; } = RepoInfoFaker;
+    }
+}
\ No newline at end of file