diff --git a/plain-flags/plain/flags/migrations/0002_alter_flagresult_unique_together_and_more.py b/plain-flags/plain/flags/migrations/0002_alter_flagresult_unique_together_and_more.py
new file mode 100644
index 0000000000..95a0c41f11
--- /dev/null
+++ b/plain-flags/plain/flags/migrations/0002_alter_flagresult_unique_together_and_more.py
@@ -0,0 +1,23 @@
+# Generated by Plain 0.3.0 on 2024-08-16 16:46
+
+from plain import models
+from plain.models import migrations
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("plainflags", "0001_initial"),
+    ]
+
+    operations = [
+        migrations.AlterUniqueTogether(
+            name="flagresult",
+            unique_together=set(),
+        ),
+        migrations.AddConstraint(
+            model_name="flagresult",
+            constraint=models.UniqueConstraint(
+                fields=("flag", "key"), name="unique_flag_result_key"
+            ),
+        ),
+    ]
diff --git a/plain-flags/plain/flags/models.py b/plain-flags/plain/flags/models.py
index 6d9d25b3ad..1e1b5adaa6 100644
--- a/plain-flags/plain/flags/models.py
+++ b/plain-flags/plain/flags/models.py
@@ -25,7 +25,11 @@ class FlagResult(models.Model):
     value = models.JSONField()
 
     class Meta:
-        unique_together = ("flag", "key")
+        constraints = [
+            models.UniqueConstraint(
+                fields=["flag", "key"], name="unique_flag_result_key"
+            )
+        ]
 
     def __str__(self):
         return self.key
diff --git a/plain-flags/tests/app/urls.py b/plain-flags/tests/app/urls.py
new file mode 100644
index 0000000000..637600f58a
--- /dev/null
+++ b/plain-flags/tests/app/urls.py
@@ -0,0 +1 @@
+urlpatterns = []
diff --git a/plain-oauth/plain/oauth/migrations/0005_alter_oauthconnection_unique_together_and_more.py b/plain-oauth/plain/oauth/migrations/0005_alter_oauthconnection_unique_together_and_more.py
new file mode 100644
index 0000000000..a6f3b7dadf
--- /dev/null
+++ b/plain-oauth/plain/oauth/migrations/0005_alter_oauthconnection_unique_together_and_more.py
@@ -0,0 +1,25 @@
+# Generated by Plain 0.3.0 on 2024-08-16 16:46
+
+from plain import models
+from plain.models import migrations
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("users", "__first__"),
+        ("plainoauth", "0004_alter_oauthconnection_access_token_and_more"),
+    ]
+
+    operations = [
+        migrations.AlterUniqueTogether(
+            name="oauthconnection",
+            unique_together=set(),
+        ),
+        migrations.AddConstraint(
+            model_name="oauthconnection",
+            constraint=models.UniqueConstraint(
+                fields=("provider_key", "provider_user_id"),
+                name="unique_oauth_provider_user_id",
+            ),
+        ),
+    ]
diff --git a/plain-oauth/plain/oauth/models.py b/plain-oauth/plain/oauth/models.py
index 983579a3bc..c2e7667afd 100644
--- a/plain-oauth/plain/oauth/models.py
+++ b/plain-oauth/plain/oauth/models.py
@@ -41,7 +41,12 @@ class OAuthConnection(models.Model):
     refresh_token_expires_at = models.DateTimeField(blank=True, null=True)
 
     class Meta:
-        unique_together = ("provider_key", "provider_user_id")
+        constraints = [
+            models.UniqueConstraint(
+                fields=["provider_key", "provider_user_id"],
+                name="unique_oauth_provider_user_id",
+            )
+        ]
         ordering = ("provider_key",)
 
     def __str__(self):