diff --git a/test/test_bitset.cpp b/test/test_bitset.cpp
index 49767ca4..1d217351 100644
--- a/test/test_bitset.cpp
+++ b/test/test_bitset.cpp
@@ -1013,6 +1013,20 @@ namespace
     }
 
     //*************************************************************************
+    TEST(test_find_next_multi_byte_bitset_github_issue_336)
+    {
+      etl::bitset<24> data;
+      data.set(12);
+      data.set(22);
+      CHECK_EQUAL(12U, data.find_next(true,  3));
+      CHECK_EQUAL(12U, data.find_next(true, 10));
+
+      // set first ten bytes
+      data.set("1111111111");
+      CHECK_EQUAL(10U, data.find_next(false, 3));
+      CHECK_EQUAL(10U, data.find_next(false, 9));
+    }
+
     TEST(test_find_next_github_issue_336)
     {
       etl::bitset<16> bits16;