diff --git a/sqldb/postgres.go b/sqldb/postgres.go
index 8cfd3e25b..70dba82a1 100644
--- a/sqldb/postgres.go
+++ b/sqldb/postgres.go
@@ -30,7 +30,10 @@ var (
 	postgresSchemaReplacements = map[string]string{
 		"BLOB":                "BYTEA",
 		"INTEGER PRIMARY KEY": "BIGSERIAL PRIMARY KEY",
-		"TIMESTAMP":           "TIMESTAMP WITHOUT TIME ZONE",
+		// We need this space in front of the TIMESTAMP keyword to
+		// avoid replacing words which just have the word "TIMESTAMP" in
+		// them.
+		" TIMESTAMP": " TIMESTAMP WITHOUT TIME ZONE",
 	}
 
 	// Make sure PostgresStore implements the MigrationExecutor interface.