diff --git a/src/PgStructure.hs b/src/PgStructure.hs
index b4bdad305..59a40f6e1 100644
--- a/src/PgStructure.hs
+++ b/src/PgStructure.hs
@@ -136,7 +136,7 @@ columns s t conn = do
     \   left outer join ( \
     \     select n.nspname as s, \
     \            t.typname as n, \
-    \            array_agg(e.enumlabel) as vals \
+    \            array_agg(e.enumlabel ORDER BY e.enumsortorder) as vals \
     \     from pg_type t \
     \        join pg_enum e on t.oid = e.enumtypid \
     \        join pg_catalog.pg_namespace n ON n.oid = t.typnamespace \
diff --git a/test/Feature/StructureSpec.hs b/test/Feature/StructureSpec.hs
index 93f7a1741..42cffb610 100644
--- a/test/Feature/StructureSpec.hs
+++ b/test/Feature/StructureSpec.hs
@@ -35,7 +35,6 @@ uRole = "dbapi_test"} in
 
   describe "Table info" $ do
     it "is available with OPTIONS verb" $
-      pending_ >>
       request methodOptions "/menagerie" [] "" `shouldRespondWith`
       [json|
       {