diff --git a/include/sbi/sbi_ecall_interface.h b/include/sbi/sbi_ecall_interface.h
index a7dab8c3..e68d9188 100644
--- a/include/sbi/sbi_ecall_interface.h
+++ b/include/sbi/sbi_ecall_interface.h
@@ -436,6 +436,8 @@ enum sbi_sse_state {
 #define SBI_SPEC_VERSION_MAJOR_OFFSET		24
 #define SBI_SPEC_VERSION_MAJOR_MASK		0x7f
 #define SBI_SPEC_VERSION_MINOR_MASK		0xffffff
+#define SBI_EXT_EXPERIMENTAL_START		0x08000000
+#define SBI_EXT_EXPERIMENTAL_END		0x08FFFFFF
 #define SBI_EXT_VENDOR_START			0x09000000
 #define SBI_EXT_VENDOR_END			0x09FFFFFF
 #define SBI_EXT_FIRMWARE_START			0x0A000000
diff --git a/lib/sbi/tests/objects.mk b/lib/sbi/tests/objects.mk
index 16608fae..a2608253 100644
--- a/lib/sbi/tests/objects.mk
+++ b/lib/sbi/tests/objects.mk
@@ -14,4 +14,7 @@ carray-sbi_unit_tests-$(CONFIG_SBIUNIT) += locks_test_suite
 libsbi-objs-$(CONFIG_SBIUNIT) += tests/riscv_locks_test.o
 
 carray-sbi_unit_tests-$(CONFIG_SBIUNIT) += math_test_suite
-libsbi-objs-$(CONFIG_SBIUNIT) += tests/sbi_math_test.o
\ No newline at end of file
+libsbi-objs-$(CONFIG_SBIUNIT) += tests/sbi_math_test.o
+
+carray-sbi_unit_tests-$(CONFIG_SBIUNIT) += ecall_test_suite
+libsbi-objs-$(CONFIG_SBIUNIT) += tests/sbi_ecall_test.o
diff --git a/lib/sbi/tests/sbi_ecall_test.c b/lib/sbi/tests/sbi_ecall_test.c
new file mode 100644
index 00000000..5b6ce37c
--- /dev/null
+++ b/lib/sbi/tests/sbi_ecall_test.c
@@ -0,0 +1,50 @@
+#include <sbi/sbi_unit_test.h>
+#include <sbi/sbi_ecall.h>
+#include <sbi/sbi_ecall_interface.h>
+
+static void test_sbi_ecall_version(struct sbiunit_test_case *test)
+{
+	SBIUNIT_EXPECT_EQ(test, sbi_ecall_version_major(), SBI_ECALL_VERSION_MAJOR);
+	SBIUNIT_EXPECT_EQ(test, sbi_ecall_version_minor(), SBI_ECALL_VERSION_MINOR);
+}
+
+static void test_sbi_ecall_impid(struct sbiunit_test_case *test)
+{
+	unsigned long old_impid = sbi_ecall_get_impid();
+	sbi_ecall_set_impid(42);
+	SBIUNIT_EXPECT_EQ(test, sbi_ecall_get_impid(), 42);
+	sbi_ecall_set_impid(old_impid);
+}
+
+static int dummy_handler(unsigned long extid, unsigned long funcid,
+			 struct sbi_trap_regs *regs,
+			 struct sbi_ecall_return *out)
+{
+	return 0;
+}
+
+static void test_sbi_ecall_register_find_extension(struct sbiunit_test_case *test)
+{
+	struct sbi_ecall_extension test_ext = {
+		/* Use experimental extension space for no overlap */
+		.extid_start = SBI_EXT_EXPERIMENTAL_START,
+		.extid_end = SBI_EXT_EXPERIMENTAL_START,
+		.name = "TestExt",
+		.handle = dummy_handler,
+	};
+
+	SBIUNIT_EXPECT_EQ(test, sbi_ecall_register_extension(&test_ext), 0);
+	SBIUNIT_EXPECT_EQ(test, sbi_ecall_find_extension(SBI_EXT_EXPERIMENTAL_START), &test_ext);
+
+	sbi_ecall_unregister_extension(&test_ext);
+	SBIUNIT_EXPECT_EQ(test, sbi_ecall_find_extension(SBI_EXT_EXPERIMENTAL_START), NULL);
+}
+
+static struct sbiunit_test_case ecall_tests[] = {
+	SBIUNIT_TEST_CASE(test_sbi_ecall_version),
+	SBIUNIT_TEST_CASE(test_sbi_ecall_impid),
+	SBIUNIT_TEST_CASE(test_sbi_ecall_register_find_extension),
+	SBIUNIT_END_CASE,
+};
+
+SBIUNIT_TEST_SUITE(ecall_test_suite, ecall_tests);