diff --git a/ceilometer/event/storage/impl_sqlalchemy.py b/ceilometer/event/storage/impl_sqlalchemy.py
index 30f97bc92..4e8ce0b79 100644
--- a/ceilometer/event/storage/impl_sqlalchemy.py
+++ b/ceilometer/event/storage/impl_sqlalchemy.py
@@ -292,7 +292,7 @@ class Connection(base.Connection):
                     models.TraitDatetime.key, models.TraitDatetime.value,
                     sa.cast(sa.null(), sa.Integer),
                     sa.cast(sa.null(), sa.Float(53)),
-                    sa.cast(sa.null(), sa.Text))
+                    sa.cast(sa.null(), sa.String(255)))
             ).union(
                 query.join(
                     models.TraitInt,
diff --git a/ceilometer/storage/sqlalchemy/migrate_repo/versions/041_expand_event_traits.py b/ceilometer/storage/sqlalchemy/migrate_repo/versions/041_expand_event_traits.py
index 332cc56a1..b739190dc 100644
--- a/ceilometer/storage/sqlalchemy/migrate_repo/versions/041_expand_event_traits.py
+++ b/ceilometer/storage/sqlalchemy/migrate_repo/versions/041_expand_event_traits.py
@@ -15,9 +15,9 @@ import sqlalchemy as sa
 
 from ceilometer.storage.sqlalchemy import models
 
-tables = [('trait_text', sa.Text, True, 't_string', 1),
+tables = [('trait_text', sa.String(255), True, 't_string', 1),
           ('trait_int', sa.Integer, False, 't_int', 2),
-          ('trait_float', sa.Float, False, 't_float', 3),
+          ('trait_float', sa.Float(53), False, 't_float', 3),
           ('trait_datetime', models.PreciseTimestamp(),
            False, 't_datetime', 4)]