diff --git a/holidays_jp/countries/jp.py b/holidays_jp/countries/jp.py
index bd19714..890ba95 100644
--- a/holidays_jp/countries/jp.py
+++ b/holidays_jp/countries/jp.py
@@ -184,7 +184,12 @@ def JP_substitute(self, _list):
                       bymonth=7, bymonthday=23)),
         Holiday('海の日',
                 rrule(YEARLY,
-                      dtstart=datetime(2021, 1, 1),
+                      dtstart=datetime(2021, 7, 22),
+                      until=datetime(2021, 7, 22),
+                      bymonth=7, bymonthday=22)),
+        Holiday('海の日',
+                rrule(YEARLY,
+                      dtstart=datetime(2022, 1, 1),
                       bymonth=7, byweekday=MO, bysetpos=3)),
         Holiday('山の日',
                 rrule(YEARLY,
@@ -198,7 +203,12 @@ def JP_substitute(self, _list):
                       bymonth=8, bymonthday=10)),
         Holiday('山の日',
                 rrule(YEARLY,
-                      dtstart=datetime(2021, 1, 1),
+                      dtstart=datetime(2021, 8, 8),
+                      until=datetime(2021, 8, 8),
+                      bymonth=8, bymonthday=8)),
+        Holiday('山の日',
+                rrule(YEARLY,
+                      dtstart=datetime(2022, 1, 1),
                       bymonth=8, bymonthday=11)),
         Holiday('敬老の日',
                 rrule(YEARLY,
@@ -231,7 +241,12 @@ def JP_substitute(self, _list):
                       bymonth=7, bymonthday=24)),
         Holiday('スポーツの日',
                 rrule(YEARLY,
-                      dtstart=datetime(2021, 1, 1),
+                      dtstart=datetime(2021, 7, 23),
+                      until=datetime(2021, 7, 23),
+                      bymonth=7, bymonthday=23)),
+        Holiday('スポーツの日',
+                rrule(YEARLY,
+                      dtstart=datetime(2022, 1, 1),
                       bymonth=10, byweekday=MO, bysetpos=2)),
         Holiday('文化の日',
                 rrule(YEARLY,
@@ -251,6 +266,10 @@ def JP_substitute(self, _list):
                       dtstart=datetime(1989, 2, 17),
                       until=datetime(2018, 12, 31),
                       bymonth=12, bymonthday=23)),
+        Holiday('天皇誕生日',
+                rrule(YEARLY,
+                      dtstart=datetime(2023, 2, 23),
+                      bymonth=2, bymonthday=23)),
         Holiday('皇太子明仁親王の結婚の儀',
                 rrule(YEARLY,
                       dtstart=datetime(1959, 4, 10),
diff --git a/holidays_jp/tests.py b/holidays_jp/tests.py
index 3b208d0..2e214f8 100644
--- a/holidays_jp/tests.py
+++ b/holidays_jp/tests.py
@@ -106,7 +106,7 @@ def testJP2020(self):
     def testJP2021(self):
         from holidays_jp import CountryHolidays
         holidays = CountryHolidays.get('JP', 2021)
-        self.assertEqual(len(holidays), 15)
+        self.assertEqual(len(holidays), 16)
         self.assertHoliday(holidays[0], datetime.datetime(2021, 1, 1), '元日')
         self.assertHoliday(holidays[1], datetime.datetime(2021, 1, 11), '成人の日')
         self.assertHoliday(holidays[2], datetime.datetime(2021, 2, 11), '建国記念の日')
@@ -115,14 +115,56 @@ def testJP2021(self):
         self.assertHoliday(holidays[5], datetime.datetime(2021, 5, 3), '憲法記念日')
         self.assertHoliday(holidays[6], datetime.datetime(2021, 5, 4), 'みどりの日')
         self.assertHoliday(holidays[7], datetime.datetime(2021, 5, 5), 'こどもの日')
-        self.assertHoliday(holidays[8], datetime.datetime(2021, 7, 19), '海の日')
-        self.assertHoliday(holidays[9], datetime.datetime(2021, 8, 11), '山の日')
-        self.assertHoliday(holidays[10], datetime.datetime(2021, 9, 20), '敬老の日')
-        self.assertHoliday(holidays[11], datetime.datetime(2021, 9, 23), '秋分の日')
-        self.assertHoliday(holidays[12], datetime.datetime(2021, 10, 11), 'スポーツの日')
-        self.assertHoliday(holidays[13], datetime.datetime(2021, 11, 3), '文化の日')
-        self.assertHoliday(holidays[14], datetime.datetime(2021, 11, 23), '勤労感謝の日')
+        self.assertHoliday(holidays[8], datetime.datetime(2021, 7, 22), '海の日')
+        self.assertHoliday(holidays[9], datetime.datetime(2021, 7, 23), 'スポーツの日')
+        self.assertHoliday(holidays[10], datetime.datetime(2021, 8, 8), '山の日')
+        self.assertHoliday(holidays[11], datetime.datetime(2021, 8, 9), '振替休日')
+        self.assertHoliday(holidays[12], datetime.datetime(2021, 9, 20), '敬老の日')
+        self.assertHoliday(holidays[13], datetime.datetime(2021, 9, 23), '秋分の日')
+        self.assertHoliday(holidays[14], datetime.datetime(2021, 11, 3), '文化の日')
+        self.assertHoliday(holidays[15], datetime.datetime(2021, 11, 23), '勤労感謝の日')
 
+    def testJP2022(self):
+        from holidays_jp import CountryHolidays
+        holidays = CountryHolidays.get('JP', 2022)
+        self.assertEqual(len(holidays), 15)
+        self.assertHoliday(holidays[0], datetime.datetime(2022, 1, 1), '元日')
+        self.assertHoliday(holidays[1], datetime.datetime(2022, 1, 10), '成人の日')
+        self.assertHoliday(holidays[2], datetime.datetime(2022, 2, 11), '建国記念の日')
+        self.assertHoliday(holidays[3], datetime.datetime(2022, 3, 21), '春分の日')
+        self.assertHoliday(holidays[4], datetime.datetime(2022, 4, 29), '昭和の日')
+        self.assertHoliday(holidays[5], datetime.datetime(2022, 5, 3), '憲法記念日')
+        self.assertHoliday(holidays[6], datetime.datetime(2022, 5, 4), 'みどりの日')
+        self.assertHoliday(holidays[7], datetime.datetime(2022, 5, 5), 'こどもの日')
+        self.assertHoliday(holidays[8], datetime.datetime(2022, 7, 18), '海の日')
+        self.assertHoliday(holidays[9], datetime.datetime(2022, 8, 11), '山の日')
+        self.assertHoliday(holidays[10], datetime.datetime(2022, 9, 19), '敬老の日')
+        self.assertHoliday(holidays[11], datetime.datetime(2022, 9, 23), '秋分の日')
+        self.assertHoliday(holidays[12], datetime.datetime(2022, 10, 10), 'スポーツの日')
+        self.assertHoliday(holidays[13], datetime.datetime(2022, 11, 3), '文化の日')
+        self.assertHoliday(holidays[14], datetime.datetime(2022, 11, 23), '勤労感謝の日')
+
+    def testJP2023(self):
+        from holidays_jp import CountryHolidays
+        holidays = CountryHolidays.get('JP', 2023)
+        self.assertEqual(len(holidays), 17)
+        self.assertHoliday(holidays[0], datetime.datetime(2023, 1, 1), '元日')
+        self.assertHoliday(holidays[1], datetime.datetime(2023, 1, 2), '振替休日')
+        self.assertHoliday(holidays[2], datetime.datetime(2023, 1, 9), '成人の日')
+        self.assertHoliday(holidays[3], datetime.datetime(2023, 2, 11), '建国記念の日')
+        self.assertHoliday(holidays[4], datetime.datetime(2023, 2, 23), '天皇誕生日')
+        self.assertHoliday(holidays[5], datetime.datetime(2023, 3, 21), '春分の日')
+        self.assertHoliday(holidays[6], datetime.datetime(2023, 4, 29), '昭和の日')
+        self.assertHoliday(holidays[7], datetime.datetime(2023, 5, 3), '憲法記念日')
+        self.assertHoliday(holidays[8], datetime.datetime(2023, 5, 4), 'みどりの日')
+        self.assertHoliday(holidays[9], datetime.datetime(2023, 5, 5), 'こどもの日')
+        self.assertHoliday(holidays[10], datetime.datetime(2023, 7, 17), '海の日')
+        self.assertHoliday(holidays[11], datetime.datetime(2023, 8, 11), '山の日')
+        self.assertHoliday(holidays[12], datetime.datetime(2023, 9, 18), '敬老の日')
+        self.assertHoliday(holidays[13], datetime.datetime(2023, 9, 23), '秋分の日')
+        self.assertHoliday(holidays[14], datetime.datetime(2023, 10, 9), 'スポーツの日')
+        self.assertHoliday(holidays[15], datetime.datetime(2023, 11, 3), '文化の日')
+        self.assertHoliday(holidays[16], datetime.datetime(2023, 11, 23), '勤労感謝の日')
 
     def testJPBetween(self):
         from holidays_jp import CountryHolidays