diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index 116363f2d9ff1432904e3887e88f982583c854fb..c1f39958b720265fc9130bad68386f55be7b8dbe 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -1,3 +1,7 @@
+*   All integer-like PKs are autoincrement unless they have an explicit default.
+
+    *Matthew Draper*
+
 *   Omit redundant `using: :btree` for schema dumping.
 
     *Ryuta Kamizono*
diff --git a/activerecord/test/cases/primary_keys_test.rb b/activerecord/test/cases/primary_keys_test.rb
index 98b9c91489c4c6a5fe4a80f6cca9de9636bc0703..03c86442293a77a93e3f9c3367422a2755bf1a64 100644
--- a/activerecord/test/cases/primary_keys_test.rb
+++ b/activerecord/test/cases/primary_keys_test.rb
@@ -238,13 +238,13 @@ def teardown
     @connection.drop_table(:auto_increments, if_exists: true)
   end
 
-  def test_primary_key_with_auto_increment
-    @connection.create_table(:auto_increments, id: :integer, auto_increment: true, force: true)
+  def test_primary_key_with_integer
+    @connection.create_table(:auto_increments, id: :integer, force: true)
     assert_auto_incremented
   end
 
-  def test_primary_key_with_auto_increment_and_bigint
-    @connection.create_table(:auto_increments, id: :bigint, auto_increment: true, force: true)
+  def test_primary_key_with_bigint
+    @connection.create_table(:auto_increments, id: :bigint, force: true)
     assert_auto_incremented
   end