diff --git a/src/checkdb.c b/src/checkdb.c
index 177fc3cc7..1133a7b5d 100644
--- a/src/checkdb.c
+++ b/src/checkdb.c
@@ -461,7 +461,9 @@ get_index_list(const char *dbname, bool first_db_with_amcheck,
 									"LEFT JOIN pg_catalog.pg_class cls ON idx.indexrelid=cls.oid "
 									"LEFT JOIN pg_catalog.pg_namespace nmspc ON cls.relnamespace=nmspc.oid "
 									"LEFT JOIN pg_catalog.pg_am am ON cls.relam=am.oid "
-									"WHERE am.amname='btree' AND cls.relpersistence != 't' "
+									"WHERE am.amname='btree' "
+									"AND cls.relpersistence != 't' "
+									"AND cls.relkind != 'I' "
 									"ORDER BY nmspc.nspname DESC",
 									0, NULL);
 	}
@@ -473,8 +475,10 @@ get_index_list(const char *dbname, bool first_db_with_amcheck,
 									"LEFT JOIN pg_catalog.pg_class cls ON idx.indexrelid=cls.oid "
 									"LEFT JOIN pg_catalog.pg_namespace nmspc ON cls.relnamespace=nmspc.oid "
 									"LEFT JOIN pg_catalog.pg_am am ON cls.relam=am.oid "
-									"WHERE am.amname='btree' AND cls.relpersistence != 't' AND "
-									"(cls.reltablespace IN "
+									"WHERE am.amname='btree' "
+									"AND cls.relpersistence != 't' "
+									"AND cls.relkind != 'I' "
+									"AND (cls.reltablespace IN "
 									"(SELECT oid from pg_catalog.pg_tablespace where spcname <> 'pg_global') "
 									"OR cls.reltablespace = 0) "
 									"ORDER BY nmspc.nspname DESC",
diff --git a/tests/checkdb.py b/tests/checkdb.py
index bcda0fb23..07b55c6db 100644
--- a/tests/checkdb.py
+++ b/tests/checkdb.py
@@ -38,6 +38,15 @@ def test_checkdb_amcheck_only_sanity(self):
         node.safe_psql(
             "postgres",
             "create index on t_heap(id)")
+            
+        node.safe_psql(
+            "postgres",
+            "create table idxpart (a int) "
+            "partition by range (a)")
+
+        node.safe_psql(
+            "postgres",
+            "create index on idxpart(a)")
 
         try:
             node.safe_psql(