diff --git a/Makefile b/Makefile
index 9cbf4095a..ea5a858bf 100644
--- a/Makefile
+++ b/Makefile
@@ -48,12 +48,12 @@ ifeq ($(USE_FDW),yes)
 		   fdw_copyto fdw_alter fdw_truncate fdw_clean
 endif
 
-# disabled tests: am_block_filtering am_analyze am_alter
+# disabled tests: am_block_filtering am_analyze
 ifeq ($(USE_TABLEAM),yes)
 	PG_CFLAGS += -DUSE_TABLEAM
 	OBJS += cstore_tableam.o
 	REGRESS += am_create am_load am_query am_data_types am_functions \
-	           am_drop am_insert am_copyto am_truncate am_clean
+	           am_drop am_insert am_copyto am_alter am_truncate am_clean
 endif
 
 ifeq ($(enable_coverage),yes)
diff --git a/cstore_tableam.c b/cstore_tableam.c
index fccb9fe6e..e241c19ea 100644
--- a/cstore_tableam.c
+++ b/cstore_tableam.c
@@ -457,7 +457,8 @@ static bool
 cstore_scan_analyze_next_block(TableScanDesc scan, BlockNumber blockno,
 							   BufferAccessStrategy bstrategy)
 {
-	elog(ERROR, "cstore_scan_analyze_next_block not implemented");
+	/* TODO */
+	return false;
 }
 
 
@@ -466,7 +467,8 @@ cstore_scan_analyze_next_tuple(TableScanDesc scan, TransactionId OldestXmin,
 							   double *liverows, double *deadrows,
 							   TupleTableSlot *slot)
 {
-	elog(ERROR, "cstore_scan_analyze_next_tuple not implemented");
+	/* TODO */
+	return false;
 }