diff --git a/dotCMS/src/test/java/com/dotcms/analytics/query/TimeDimensionParserTest.java b/dotCMS/src/test/java/com/dotcms/analytics/query/TimeDimensionParserTest.java
index 13a23dcec78..f3c65911f9b 100644
--- a/dotCMS/src/test/java/com/dotcms/analytics/query/TimeDimensionParserTest.java
+++ b/dotCMS/src/test/java/com/dotcms/analytics/query/TimeDimensionParserTest.java
@@ -26,9 +26,9 @@ public void test_parseTimeDimension_dimension_plus_granularity_should_be_OK() th
     }
 
     /**
-     * Parse a simple query with only dimension and granularity
-     * Events.day day
-     * should return Events.day and day
+     * Parse a simple query with  dimension, granularity and dateRange
+     * Events.day day This Week
+     * should return Events.day and day and This Week
      */
     @Test
     public void test_parseTimeDimension_dimension_plus_granularity_and_dateRange_should_be_OK() throws Exception {
@@ -40,4 +40,37 @@ public void test_parseTimeDimension_dimension_plus_granularity_and_dateRange_sho
         Assert.assertEquals("day", result.getGranularity());
         Assert.assertEquals("This Week", result.getDateRange());
     }
+
+    /**
+     * Parse a simple query with  dimension, granularity and dateRange
+     * Events.day day yesterday
+     * should return Events.day and day and yesterday
+     */
+    @Test
+    public void test_parseTimeDimension_dimension_plus_granularity_and_dateRange_yesterday_should_be_OK() throws Exception {
+        final TimeDimensionParser.TimeDimension result =
+                TimeDimensionParser.parseTimeDimension("Events.day day yesterday");
+
+        Assert.assertNotNull(result);
+        Assert.assertEquals("Events.day", result.getDimension());
+        Assert.assertEquals("day", result.getGranularity());
+        Assert.assertEquals("yesterday", result.getDateRange());
+    }
+    /**
+     * Parse a simple query with  dimension, granularity and dateRange
+     * Events.day day Last 7 days
+     * should return Events.day and day and Last 7 days
+     */
+    @Test
+    public void test_parseTimeDimension_dimension_plus_granularity_and_dateRange_last_7_days_should_be_OK() throws Exception {
+        final TimeDimensionParser.TimeDimension result =
+                TimeDimensionParser.parseTimeDimension("Events.day day Last 7 days");
+
+        Assert.assertNotNull(result);
+        Assert.assertEquals("Events.day", result.getDimension());
+        Assert.assertEquals("day", result.getGranularity());
+        Assert.assertEquals("Last 7 days", result.getDateRange());
+    }
+
+
 }