diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6a52361be..9bfaa8cc1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -28,6 +28,7 @@
 - Removed `Location` datatype in favour of `Building`
 - Refactor tests to run directly on tuple input to prevent unnecessary unpacking and repacking
 - Renamed usages of the word "room" to "location" in the codebase to better reflect the data represented
+- Added test cases for JSON parsing of Time' data type in `backend-test/Database/TablesTests.hs`
 
 ## [0.7.2] - 2025-12-10
 
diff --git a/README.md b/README.md
index 404f4d141..d6f913b18 100644
--- a/README.md
+++ b/README.md
@@ -143,6 +143,7 @@ Ian Stewart-Binks,
 Alan Su,
 Maryam Taj,
 Betty Wang,
+Rui Weng,
 Fullchee Zhang,
 Minfan Zhang,
 Alex Shih,
diff --git a/app/Database/Tables.hs b/app/Database/Tables.hs
index edc6366c4..3630fdb8d 100644
--- a/app/Database/Tables.hs
+++ b/app/Database/Tables.hs
@@ -174,7 +174,7 @@ data Time' =
           endHour' :: Double,
           firstLocation' :: Maybe T.Text,
           secondLocation' :: Maybe T.Text
-        } deriving (Show, Generic)
+        } deriving (Show, Eq, Generic)
 
 data Time =
   Time { weekDay :: Double,
diff --git a/backend-test/Database/TablesTests.hs b/backend-test/Database/TablesTests.hs
new file mode 100644
index 000000000..28ee36447
--- /dev/null
+++ b/backend-test/Database/TablesTests.hs
@@ -0,0 +1,47 @@
+{-|
+Description: Tables module tests.
+
+Module that contains the tests for the functions in the Tables module.
+
+-}
+
+module Database.TablesTests
+( test_tables
+) where
+
+import Data.Aeson (decode)
+import qualified Data.Text as T
+import qualified Data.Text.Encoding as TE
+import qualified Data.ByteString.Lazy as BL
+import Database.Tables (Time' (..))
+import Test.Tasty (TestTree, testGroup)
+import Test.Tasty.HUnit (assertEqual, testCase)
+
+-- | List of test cases as (label, input JSON string, expected output)
+time'FromJSONTestCases :: [(String, T.Text, Maybe Time')]
+time'FromJSONTestCases =
+    [ ("Empty JSON string", "", Nothing)
+    , ("Valid JSON string", "{ \"start\": { \"day\": 1, \"millisofday\": 36000000 }, \"end\": { \"millisofday\": 39600000 }, \"building\": { \"buildingCode\": \"BA\", \"buildingRoomNumber\": \"1130\" }, \"assignedRoom2\": \"MP102\" }", Just (Time' {weekDay' = 0.0, startHour' = 10.0, endHour' = 11.0, firstLocation' = Just "BA1130", secondLocation' = Just "MP102"}))
+    , ("Valid JSON string with no second location", "{ \"start\": { \"day\": 2, \"millisofday\": 39600000 }, \"end\": { \"millisofday\": 43200000 }, \"building\": { \"buildingCode\": \"MP\", \"buildingRoomNumber\": \"203\" } }", Just (Time' {weekDay' = 1.0, startHour' = 11.0, endHour' = 12.0, firstLocation' = Just "MP203", secondLocation' = Nothing}))
+    , ("Invalid JSON string (no day value)", "{ \"start\": { \"millisofday\": 43200000 }, \"end\": { \"millisofday\": 50400000 }, \"building\": { \"buildingCode\": \"MY\", \"buildingRoomNumber\": \"150\" } }", Just (Time' {weekDay' = 5.0, startHour' = 25.0, endHour' = 25.0, firstLocation' = Just "MY150", secondLocation' = Nothing}))
+    , ("Invalid JSON string (no start millisofday value)", "{ \"start\": { \"day\": 3 }, \"end\": { \"millisofday\": 50400000 }, \"building\": { \"buildingCode\": \"MY\", \"buildingRoomNumber\": \"150\" } }", Just (Time' {weekDay' = 5.0, startHour' = 25.0, endHour' = 25.0, firstLocation' = Just "MY150", secondLocation' = Nothing}))
+    , ("Invalid JSON string (no end millisofday value)", "{ \"start\": { \"day\": 3, \"millisofday\": 43200000 }, \"end\": { }, \"building\": { \"buildingCode\": \"MY\", \"buildingRoomNumber\": \"150\" } }", Just (Time' {weekDay' = 5.0, startHour' = 25.0, endHour' = 25.0, firstLocation' = Just "MY150", secondLocation' = Nothing}))
+    , ("Invalid JSON string (no buildingCode value)", "{ \"start\": { \"day\": 4, \"millisofday\": 50400000 }, \"end\": { \"millisofday\": 54000000 }, \"building\": { \"buildingRoomNumber\": \"202\" } }", Nothing)
+    , ("Invalid JSON string (no buildingRoomNumber value)", "{ \"start\": { \"day\": 4, \"millisofday\": 50400000 }, \"end\": { \"millisofday\": 54000000 }, \"building\": { \"buildingCode\": \"MP\" } }", Nothing)
+    ]
+
+-- | Run a test case (label, input JSON string, expected output) on the FromJSON instance of Time'.
+runTime'FromJSONTest :: (String, T.Text, Maybe Time') -> TestTree
+runTime'FromJSONTest (label, input, expected) =
+    testCase label $ do
+        let decoded = decode (BL.fromStrict (TE.encodeUtf8 input)) :: Maybe Time'
+        assertEqual ("Unexpected response body for " ++ label) expected decoded
+
+-- | Run all the time'FromJSON test cases
+runTime'FromJSONTests :: [TestTree]
+runTime'FromJSONTests = map runTime'FromJSONTest time'FromJSONTestCases
+
+-- | Test suite for Tables Module
+test_tables :: TestTree
+test_tables =
+    testGroup "Tables tests" runTime'FromJSONTests
\ No newline at end of file