diff --git a/griffin/griffin.c b/griffin/griffin.c
index bba2c214ac..3661b9c890 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -76,6 +76,12 @@ CHEATS
 #include "../cheats.c"
 #include "../libretro-common/hash/rhash.c"
 
+/*============================================================
+ACHIEVEMENTS
+============================================================ */
+#include "../libretro-common/formats/json/jsonsax.c"
+#include "../cheevos.c"
+
 /*============================================================
 UI COMMON CONTEXT
 ============================================================ */
diff --git a/runloop.c b/runloop.c
index 120ebd43bb..8b7f93bf31 100644
--- a/runloop.c
+++ b/runloop.c
@@ -1028,6 +1028,8 @@ int rarch_main_iterate(unsigned *sleep_ms)
 
    /* Run libretro for one frame. */
    core.retro_run();
+   /* Test the achievements. */
+   cheevos_test();
 
    for (i = 0; i < settings->input.max_users; i++)
    {