diff --git a/realm/realm.mk b/realm/realm.mk
index b033627..923a687 100644
--- a/realm/realm.mk
+++ b/realm/realm.mk
@@ -12,6 +12,7 @@
 	-Iinclude/common						\
 	-Iinclude/common/${ARCH}					\
 	-Iinclude/lib							\
+	-Iinclude/lib/extensions					\
 	-Iinclude/lib/${ARCH}						\
 	-Iinclude/lib/utils						\
 	-Iinclude/lib/xlat_tables					\
@@ -39,7 +40,8 @@
 	lib/smc/${ARCH}/smc.c						\
 	lib/exceptions/${ARCH}/sync.c					\
 	lib/locks/${ARCH}/spinlock.S					\
-	lib/delay/delay.c
+	lib/delay/delay.c						\
+	lib/extensions/fpu/fpu.c
 
 # TODO: Remove dependency on TFTF files.
 REALM_SOURCES	+=							\
diff --git a/realm/realm_payload_main.c b/realm/realm_payload_main.c
index 414c329..c6665b4 100644
--- a/realm/realm_payload_main.c
+++ b/realm/realm_payload_main.c
@@ -8,6 +8,7 @@
 #include <stdio.h>
 
 #include <debug.h>
+#include <fpu.h>
 #include <host_realm_helper.h>
 #include <host_shared_data.h>
 #include "realm_def.h"
@@ -15,6 +16,7 @@
 #include <realm_tests.h>
 #include <tftf_lib.h>
 
+static fpu_reg_state_t fpu_temp_rl;
 /*
  * This function reads sleep time in ms from shared buffer and spins PE
  * in a loop for that time period.
@@ -85,6 +87,13 @@
 		case REALM_PMU_INTERRUPT:
 			test_succeed = test_pmuv3_overflow_interrupt();
 			break;
+		case REALM_REQ_FPU_FILL_CMD:
+			fpu_state_fill_regs_and_template(&fpu_temp_rl);
+			test_succeed = true;
+			break;
+		case REALM_REQ_FPU_CMP_CMD:
+			test_succeed = fpu_state_compare_template(&fpu_temp_rl);
+			break;
 		default:
 			realm_printf("%s() invalid cmd %u\n", __func__, cmd);
 			break;