diff --git a/guava/src/test/java/org/baeldung/guava/GuavaRangeMapTest.java b/guava/src/test/java/org/baeldung/guava/GuavaRangeMapTest.java
new file mode 100644
index 0000000000..e74acc5d25
--- /dev/null
+++ b/guava/src/test/java/org/baeldung/guava/GuavaRangeMapTest.java
@@ -0,0 +1,120 @@
+package org.baeldung.guava;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import java.util.Map;
+import org.junit.Test;
+import com.google.common.collect.ImmutableRangeMap;
+import com.google.common.collect.Range;
+import com.google.common.collect.RangeMap;
+import com.google.common.collect.TreeRangeMap;
+
+public class GuavaRangeMapTest {
+
+    @Test
+    public void givenRangeMap_whenQueryWithinRange_returnsSucessfully() {
+        final RangeMap<Integer, String> experienceRangeDesignationMap = TreeRangeMap.create();
+
+        experienceRangeDesignationMap.put(Range.closed(0, 2), "Associate");
+        experienceRangeDesignationMap.put(Range.closed(3, 5), "Senior Associate");
+        experienceRangeDesignationMap.put(Range.closed(6, 8), "Vice President");
+        experienceRangeDesignationMap.put(Range.closed(9, 15), "Executive Director");
+        experienceRangeDesignationMap.put(Range.closed(16, 30), "Managing Director");
+
+        assertEquals("Vice President", experienceRangeDesignationMap.get(6));
+        assertEquals("Executive Director", experienceRangeDesignationMap.get(15));
+    }
+
+    @Test
+    public void givenRangeMap_whenQueryOutsideRange_returnsNull() {
+        final RangeMap<Integer, String> experienceRangeDesignationMap = TreeRangeMap.create();
+
+        experienceRangeDesignationMap.put(Range.closed(0, 2), "Associate");
+        experienceRangeDesignationMap.put(Range.closed(3, 5), "Senior Associate");
+        experienceRangeDesignationMap.put(Range.closed(6, 8), "Vice President");
+        experienceRangeDesignationMap.put(Range.closed(9, 15), "Executive Director");
+        experienceRangeDesignationMap.put(Range.closed(16, 30), "Managing Director");
+
+        assertNull(experienceRangeDesignationMap.get(31));
+    }
+
+    @Test
+    public void givenRangeMap_whenRemoveRangeIsCalled_removesSucessfully() {
+        final RangeMap<Integer, String> experienceRangeDesignationMap = TreeRangeMap.create();
+
+        experienceRangeDesignationMap.put(Range.closed(0, 2), "Associate");
+        experienceRangeDesignationMap.put(Range.closed(3, 5), "Senior Associate");
+        experienceRangeDesignationMap.put(Range.closed(6, 8), "Vice President");
+        experienceRangeDesignationMap.put(Range.closed(9, 15), "Executive Director");
+        experienceRangeDesignationMap.put(Range.closed(16, 30), "Managing Director");
+        experienceRangeDesignationMap.remove(Range.closed(8, 15));
+        experienceRangeDesignationMap.remove(Range.closed(20, 26));
+
+        assertNull(experienceRangeDesignationMap.get(9));
+        assertEquals("Managing Director", experienceRangeDesignationMap.get(16));
+        assertEquals("Managing Director", experienceRangeDesignationMap.get(30));
+        assertNull(experienceRangeDesignationMap.get(25));
+    }
+
+    @Test
+    public void givenRangeMap_whenSpanIsCalled_returnsSucessfully() {
+        final RangeMap<Integer, String> experienceRangeDesignationMap = TreeRangeMap.create();
+
+        experienceRangeDesignationMap.put(Range.closed(0, 2), "Associate");
+        experienceRangeDesignationMap.put(Range.closed(3, 5), "Senior Associate");
+        experienceRangeDesignationMap.put(Range.closed(6, 8), "Vice President");
+        experienceRangeDesignationMap.put(Range.closed(9, 15), "Executive Director");
+        experienceRangeDesignationMap.put(Range.closed(16, 30), "Managing Director");
+        final Range<Integer> experienceSpan = experienceRangeDesignationMap.span();
+
+        assertEquals(0, experienceSpan.lowerEndpoint().intValue());
+        assertEquals(30, experienceSpan.upperEndpoint().intValue());
+    }
+
+    @Test
+    public void givenRangeMap_whenGetEntryIsCalled_returnsEntrySucessfully() {
+        final RangeMap<Integer, String> experienceRangeDesignationMap = TreeRangeMap.create();
+
+        experienceRangeDesignationMap.put(Range.closed(0, 2), "Associate");
+        experienceRangeDesignationMap.put(Range.closed(3, 5), "Senior Associate");
+        experienceRangeDesignationMap.put(Range.closed(6, 8), "Vice President");
+        experienceRangeDesignationMap.put(Range.closed(9, 15), "Executive Director");
+        experienceRangeDesignationMap.put(Range.closed(20, 30), "Managing Director");
+        final Map.Entry<Range<Integer>, String> experiencEntry = experienceRangeDesignationMap.getEntry(10);
+
+        assertEquals(Range.closed(9, 15), experiencEntry.getKey());
+        assertEquals("Executive Director", experiencEntry.getValue());
+    }
+
+    @Test
+    public void givenRangeMap_whenSubRangeMapIsCalled_returnsSubRangeSucessfully() {
+        final RangeMap<Integer, String> experienceRangeDesignationMap = TreeRangeMap.create();
+
+        experienceRangeDesignationMap.put(Range.closed(0, 2), "Associate");
+        experienceRangeDesignationMap.put(Range.closed(3, 5), "Senior Associate");
+        experienceRangeDesignationMap.put(Range.closed(6, 8), "Vice President");
+        experienceRangeDesignationMap.put(Range.closed(8, 15), "Executive Director");
+        experienceRangeDesignationMap.put(Range.closed(16, 30), "Managing Director");
+        final RangeMap<Integer, String> experiencedSubRangeDesignationMap = experienceRangeDesignationMap.subRangeMap(Range.closed(4, 14));
+
+        assertNull(experiencedSubRangeDesignationMap.get(3));
+        assertEquals("Executive Director", experiencedSubRangeDesignationMap.get(14));
+        assertEquals("Vice President", experiencedSubRangeDesignationMap.get(7));
+    }
+
+    @Test
+    public void givenImmutableRangeMap_whenQueryWithinRange_returnsSucessfully() {
+        final RangeMap<Integer, String> experienceRangeDesignationMap = ImmutableRangeMap.<Integer, String> builder().put(Range.closed(0, 2), "Associate").put(Range.closed(3, 5), "Senior Associate").put(Range.closed(6, 8), "Vice President")
+                .put(Range.closed(9, 15), "Executive Director").put(Range.closed(16, 30), "Managing Director").build();
+
+        assertEquals("Vice President", experienceRangeDesignationMap.get(6));
+        assertEquals("Executive Director", experienceRangeDesignationMap.get(15));
+    }
+    
+    @Test(expected = IllegalArgumentException.class)
+    public void givenImmutableRangeMap_whenRangeOverlaps_ThrowsException() {
+        ImmutableRangeMap.<Integer, String> builder().put(Range.closed(0, 2), "Associate").put(Range.closed(3, 5), "Senior Associate").put(Range.closed(6, 8), "Vice President")
+                .put(Range.closed(8, 15), "Executive Director").put(Range.closed(16, 30), "Managing Director").build();
+
+    }
+}