diff --git a/expected/hypopg.out b/expected/hypopg.out
index e51e948..f5a8b0a 100644
--- a/expected/hypopg.out
+++ b/expected/hypopg.out
@@ -26,7 +26,7 @@ WARNING:  hypopg: SQL order #3 is not a CREATE INDEX statement
   1
 (1 row)
 
-SELECT nspname, relname, amname FROM public.hypopg_list_indexes();
+SELECT nspname, relname, amname FROM public.hypopg_list_indexes;
  nspname | relname | amname 
 ---------+---------+--------
  public  | hypo    | btree
diff --git a/hypopg--1.2.0.sql b/hypopg--1.2.0.sql
index d8243fa..b763644 100644
--- a/hypopg--1.2.0.sql
+++ b/hypopg--1.2.0.sql
@@ -40,17 +40,13 @@ CREATE FUNCTION hypopg(OUT indexname text, OUT indexrelid oid,
     LANGUAGE c COST 100
 AS '$libdir/hypopg', 'hypopg';
 
-CREATE FUNCTION hypopg_list_indexes(OUT indexrelid oid, OUT indexname text, OUT nspname name, OUT relname name, OUT amname name)
-    RETURNS SETOF record
+CREATE VIEW hypopg_list_indexes
 AS
-$_$
     SELECT h.indexrelid, h.indexname, n.nspname, c.relname, am.amname
     FROM hypopg() h
-    JOIN pg_class c ON c.oid = h.indrelid
-    JOIN pg_namespace n ON n.oid = c.relnamespace
-    JOIN pg_am am ON am.oid = h.amid
-$_$
-LANGUAGE sql;
+    JOIN pg_catalog.pg_class c ON c.oid = h.indrelid
+    JOIN pg_catalog.pg_namespace n ON n.oid = c.relnamespace
+    JOIN pg_catalog.pg_am am ON am.oid = h.amid;
 
 CREATE FUNCTION
 hypopg_relation_size(IN indexid oid)
diff --git a/test/sql/hypopg.sql b/test/sql/hypopg.sql
index 3aac4af..7712c3f 100644
--- a/test/sql/hypopg.sql
+++ b/test/sql/hypopg.sql
@@ -25,7 +25,7 @@ ANALYZE hypo;
 SELECT COUNT(*) AS nb
 FROM public.hypopg_create_index('SELECT 1;CREATE INDEX ON hypo(id); SELECT 2');
 
-SELECT nspname, relname, amname FROM public.hypopg_list_indexes();
+SELECT nspname, relname, amname FROM public.hypopg_list_indexes;
 
 -- Should use hypothetical index
 SELECT COUNT(*) FROM do_explain('SELECT * FROM hypo WHERE id = 1') e