diff --git a/test/bit_rotate_test.cpp b/test/bit_rotate_test.cpp
index 2fbc226..c99f29c 100644
--- a/test/bit_rotate_test.cpp
+++ b/test/bit_rotate_test.cpp
@@ -133,6 +133,12 @@ int main()
             BOOST_TEST_EQ( +boost::core::rotr( x, i ), +x );
         }
 
+        {
+            unsigned short x = 0;
+            BOOST_TEST_EQ( boost::core::rotl( x, i ), x );
+            BOOST_TEST_EQ( boost::core::rotr( x, i ), x );
+        }
+
         {
             unsigned int x = 0;
             BOOST_TEST_EQ( boost::core::rotl( x, i ), x );
@@ -159,6 +165,7 @@ int main()
         boost::uint64_t x = rng();
 
         test_rotate( static_cast<unsigned char>( x ) );
+        test_rotate( static_cast<unsigned short>( x ) );
         test_rotate( static_cast<unsigned int>( x ) );
         test_rotate( static_cast<unsigned long>( x ) );
         test_rotate( static_cast<unsigned long long>( x ) );