diff --git a/src/arch/x86/boot/acpi.c b/src/arch/x86/boot/acpi.c
index 1c373ac6c0..a3bf718592 100644
--- a/src/arch/x86/boot/acpi.c
+++ b/src/arch/x86/boot/acpi.c
@@ -36,7 +36,6 @@
 #if CONFIG_COLLECT_TIMESTAMPS
 #include <timestamp.h>
 #endif
-#include <coverage.h>
 
 /* FIXME: Kconfig doesn't support overridable defaults :-( */
 #ifndef CONFIG_HPET_MIN_TICKS
@@ -638,9 +637,6 @@ void acpi_resume(void *wake_vec)
 	/* Call mainboard resume handler first, if defined. */
 	if (mainboard_suspend_resume)
 		mainboard_suspend_resume();
-#if CONFIG_COVERAGE
-	coverage_exit();
-#endif
 	/* Tear down the caching of the ROM. */
 	if (disable_cache_rom)
 		disable_cache_rom();
diff --git a/src/include/coverage.h b/src/include/coverage.h
deleted file mode 100644
index e1c50c5ee9..0000000000
--- a/src/include/coverage.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2012 Google, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
- */
-
-void coverage_init(void);
-void coverage_exit(void);
diff --git a/src/lib/gcov-glue.c b/src/lib/gcov-glue.c
index 4e2b2908b3..ab9062b497 100644
--- a/src/lib/gcov-glue.c
+++ b/src/lib/gcov-glue.c
@@ -18,8 +18,8 @@
  */
 
 #include <stdint.h>
+#include <bootstate.h>
 #include <cbmem.h>
-#include <coverage.h>
 
 typedef struct file {
 	uint32_t magic;
@@ -128,7 +128,7 @@ static void setbuf(FILE *stream, char *buf)
 	gcc_assert(buf == 0);
 }
 
-void coverage_init(void)
+static void coverage_init(void *unused)
 {
 	extern long __CTOR_LIST__;
 	typedef void (*func_ptr)(void) ;
@@ -142,7 +142,7 @@ void coverage_init(void)
 }
 
 void __gcov_flush(void);
-void coverage_exit(void)
+static void coverage_exit(void *unused)
 {
 #if CONFIG_DEBUG_COVERAGE
 	printk(BIOS_DEBUG, "Syncing coverage data.\n");
@@ -150,4 +150,8 @@ void coverage_exit(void)
 	__gcov_flush();
 }
 
-
+BOOT_STATE_INIT_ENTRIES(gcov_bscb) = {
+	BOOT_STATE_INIT_ENTRY(BS_PRE_DEVICE, BS_ON_ENTRY, coverage_init, NULL),
+	BOOT_STATE_INIT_ENTRY(BS_OS_RESUME, BS_ON_ENTRY, coverage_exit, NULL),
+	BOOT_STATE_INIT_ENTRY(BS_PAYLOAD_LOAD, BS_ON_EXIT, coverage_exit, NULL),
+};
diff --git a/src/lib/hardwaremain.c b/src/lib/hardwaremain.c
index d8b9d433f6..e4b2659515 100644
--- a/src/lib/hardwaremain.c
+++ b/src/lib/hardwaremain.c
@@ -38,7 +38,6 @@
 #include <arch/acpi.h>
 #endif
 #include <cbmem.h>
-#include <coverage.h>
 #include <timestamp.h>
 
 #if BOOT_STATE_DEBUG
@@ -331,10 +330,6 @@ void hardwaremain(int boot_complete)
 	timestamp_stash(TS_START_RAMSTAGE);
 	post_code(POST_ENTRY_RAMSTAGE);
 
-#if CONFIG_COVERAGE
-	coverage_init();
-#endif
-
 	/* console_init() MUST PRECEDE ALL printk()! */
 	console_init();
 
diff --git a/src/lib/selfboot.c b/src/lib/selfboot.c
index be03b853a6..934c13196c 100644
--- a/src/lib/selfboot.c
+++ b/src/lib/selfboot.c
@@ -33,7 +33,6 @@
 #if CONFIG_COLLECT_TIMESTAMPS
 #include <timestamp.h>
 #endif
-#include <coverage.h>
 
 /* Maximum physical address we can use for the coreboot bounce buffer. */
 #ifndef MAX_ADDR
@@ -537,9 +536,6 @@ int selfboot(struct lb_memory *mem, struct cbfs_payload *payload)
 #if CONFIG_COLLECT_TIMESTAMPS
 	timestamp_add_now(TS_SELFBOOT_JUMP);
 #endif
-#if CONFIG_COVERAGE
-	coverage_exit();
-#endif
 
 	/* Tear down the caching of the ROM. */
 	if (disable_cache_rom)