diff --git a/tests/TestApp/config/Migrations/20200208100000_initial_migration.php b/tests/TestApp/config/Migrations/20200208100000_initial_migration.php
index 07969d7..9b6e1ef 100644
--- a/tests/TestApp/config/Migrations/20200208100000_initial_migration.php
+++ b/tests/TestApp/config/Migrations/20200208100000_initial_migration.php
@@ -24,7 +24,7 @@ public function up()
 //                'limit' => 11,
 //                'generated' => \Phinx\Db\Adapter\PostgresAdapter::GENERATED_BY_DEFAULT,
 //            ])
-//            ->addPrimaryKey(['id'])
+            ->addPrimaryKey(['id'])
             ->addColumn('name', 'string', [
                 'limit' => 128,
                 'null' => false,
@@ -58,8 +58,6 @@ public function up()
                 'default' => null,
                 'null' => true,
             ])
-            ->addIndex('address_id')
-            ->addIndex('business_address_id')
             ->addTimestamps('created', 'modified')
             ->create();
 
@@ -69,7 +67,7 @@ public function up()
 //                'limit' => 11,
 //                'generated' => \Phinx\Db\Adapter\PostgresAdapter::GENERATED_BY_DEFAULT,
 //            ])
-//            ->addPrimaryKey(['id'])
+            ->addPrimaryKey(['id'])
             ->addColumn('title', 'string', [
                 'limit' => 128,
                 'null' => false,
@@ -96,7 +94,7 @@ public function up()
 //                'limit' => 11,
 //                'generated' => \Phinx\Db\Adapter\PostgresAdapter::GENERATED_BY_DEFAULT,
 //            ])
-//            ->addPrimaryKey(['id'])
+            ->addPrimaryKey(['id'])
             ->addColumn('author_id', 'integer', [
                 'limit' => 11,
                 'null' => false,
@@ -105,12 +103,6 @@ public function up()
                 'limit' => 11,
                 'null' => false,
             ])
-            ->addIndex([
-                'author_id',
-            ])
-            ->addIndex([
-                'article_id',
-            ])
             ->create();
 
         $this->table('addresses')
@@ -119,7 +111,7 @@ public function up()
 //                'limit' => 11,
 //                'generated' => \Phinx\Db\Adapter\PostgresAdapter::GENERATED_BY_DEFAULT,
 //            ])
-//            ->addPrimaryKey(['id'])
+            ->addPrimaryKey(['id'])
             ->addColumn('street', 'string', [
                 'limit' => 128,
                 'null' => false,
@@ -138,7 +130,7 @@ public function up()
 //                'limit' => 11,
 //                'generated' => \Phinx\Db\Adapter\PostgresAdapter::GENERATED_BY_DEFAULT,
 //            ])
-//            ->addPrimaryKey(['id'])
+            ->addPrimaryKey(['id'])
             ->addColumn('name', 'string', [
                 'limit' => 128,
                 'null' => false,
@@ -151,7 +143,6 @@ public function up()
                 'limit' => 11,
                 'null' => false,
             ])
-            ->addIndex('country_id')
             // These fields should not be set by the DB by default
             // They are used to test that the TimeStampBehavior is
             // correctly applied by default.
@@ -165,7 +156,7 @@ public function up()
 //                'limit' => 11,
 //                'generated' => \Phinx\Db\Adapter\PostgresAdapter::GENERATED_BY_DEFAULT,
 //            ])
-//            ->addPrimaryKey(['id'])
+            ->addPrimaryKey(['id'])
             ->addColumn('name', 'string', [
                 'limit' => 128,
                 'null' => false,
diff --git a/tests/TestApp/config/Migrations/20211022100000_table_without_model_migration.php b/tests/TestApp/config/Migrations/20211022100000_table_without_model_migration.php
index 63bc9a2..03890c0 100644
--- a/tests/TestApp/config/Migrations/20211022100000_table_without_model_migration.php
+++ b/tests/TestApp/config/Migrations/20211022100000_table_without_model_migration.php
@@ -24,7 +24,7 @@ public function up()
 //                'limit' => 11,
 //                'generated' => \Phinx\Db\Adapter\PostgresAdapter::GENERATED_BY_DEFAULT,
 //            ])
-//            ->addPrimaryKey(['id'])
+            ->addPrimaryKey(['id'])
             ->addColumn('name', 'string', [
                 'limit' => 128,
                 'null' => false,
diff --git a/tests/TestApp/plugins/TestPlugin/config/Migrations/20200513155719_CreateCustomers.php b/tests/TestApp/plugins/TestPlugin/config/Migrations/20200513155719_CreateCustomers.php
index 38baf29..23a2286 100644
--- a/tests/TestApp/plugins/TestPlugin/config/Migrations/20200513155719_CreateCustomers.php
+++ b/tests/TestApp/plugins/TestPlugin/config/Migrations/20200513155719_CreateCustomers.php
@@ -32,7 +32,7 @@ public function up()
 //                'limit' => 11,
 //                'generated' => \Phinx\Db\Adapter\PostgresAdapter::GENERATED_BY_DEFAULT,
 //            ])
-//            ->addPrimaryKey(['id'])
+            ->addPrimaryKey(['id'])
             ->addColumn('name', 'string', [
                 'limit' => 128,
                 'null' => false,
diff --git a/tests/TestApp/plugins/TestPlugin/config/Migrations/20200513155720_CreateBills.php b/tests/TestApp/plugins/TestPlugin/config/Migrations/20200513155720_CreateBills.php
index 054d5ca..d66b061 100644
--- a/tests/TestApp/plugins/TestPlugin/config/Migrations/20200513155720_CreateBills.php
+++ b/tests/TestApp/plugins/TestPlugin/config/Migrations/20200513155720_CreateBills.php
@@ -32,7 +32,7 @@ public function up()
 //                'limit' => 11,
 //                'generated' => \Phinx\Db\Adapter\PostgresAdapter::GENERATED_BY_DEFAULT,
 //            ])
-//            ->addPrimaryKey(['id'])
+            ->addPrimaryKey(['id'])
             ->addColumn('customer_id', 'integer', [
                 'limit' => 11,
                 'null' => false,