diff --git a/activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb b/activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb
index <HASH>..<HASH> 100644
--- a/activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb
+++ b/activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb
@@ -189,7 +189,7 @@ module ActiveRecord
         DualEncoding.connection.execute(<<-eosql)
           CREATE TABLE dual_encodings (
             id integer PRIMARY KEY AUTOINCREMENT,
-            name string,
+            name varchar(255),
             data binary
           )
         eosql
"string" isn't a valid column type for ActiveRecord

Conflicts:
	activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb