diff --git a/tests/test_albums_folders_catalina_10_15_4.py b/tests/test_albums_folders_catalina_10_15_4.py
index bc0ec373..f8023829 100644
--- a/tests/test_albums_folders_catalina_10_15_4.py
+++ b/tests/test_albums_folders_catalina_10_15_4.py
@@ -42,7 +42,7 @@ ALBUM_PHOTO_UUID_DICT = {
     ],
 }
 
-######### Test FolderInfo ##########
+UUID_DICT = {"two_albums": "F12384F6-CD17-4151-ACBA-AE0E3688539E"}
 
 
 def test_folders_1():
@@ -213,3 +213,27 @@ def test_albums_photos():
         assert len(photos) == len(album)
         for photo in photos:
             assert photo.uuid in ALBUM_PHOTO_UUID_DICT[album.title]
+
+
+def test_photoinfo_albums():
+    import osxphotos
+
+    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
+    photos = photosdb.photos(uuid=ALBUM_PHOTO_UUID_DICT["Pumpkin Farm"])
+
+    albums = photos[0].albums
+    assert "Pumpkin Farm" in albums
+
+
+def test_photoinfo_album_info():
+    import osxphotos
+
+    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
+    photos = photosdb.photos(uuid=[UUID_DICT["two_albums"]])
+
+    album_info = photos[0].album_info
+    assert len(album_info) == 2
+    assert album_info[0].title in ["Pumpkin Farm", "Test Album"]
+    assert album_info[1].title in ["Pumpkin Farm", "Test Album"]
+
+    assert photos[0] in album_info[0].photos
diff --git a/tests/test_albums_folders_mojave_10_14_6.py b/tests/test_albums_folders_mojave_10_14_6.py
index 031ddd72..41971c2c 100644
--- a/tests/test_albums_folders_mojave_10_14_6.py
+++ b/tests/test_albums_folders_mojave_10_14_6.py
@@ -46,6 +46,8 @@ ALBUM_PHOTO_UUID_DICT = {
     # ],
 }
 
+UUID_DICT = {"two_albums": "8SOE9s0XQVGsuq4ONohTng"}
+
 ######### Test FolderInfo ##########
 
 
@@ -231,3 +233,27 @@ def test_albums_photos():
         assert len(photos) == len(album)
         for photo in photos:
             assert photo.uuid in ALBUM_PHOTO_UUID_DICT[album.title]
+
+
+def test_photoinfo_albums():
+    import osxphotos
+
+    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
+    photos = photosdb.photos(uuid=ALBUM_PHOTO_UUID_DICT["Pumpkin Farm"])
+
+    albums = photos[0].albums
+    assert "Pumpkin Farm" in albums
+
+
+def test_photoinfo_album_info():
+    import osxphotos
+
+    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
+    photos = photosdb.photos(uuid=[UUID_DICT["two_albums"]])
+
+    album_info = photos[0].album_info
+    assert len(album_info) == 2
+    assert album_info[0].title in ["Pumpkin Farm", "Test Album"]
+    assert album_info[1].title in ["Pumpkin Farm", "Test Album"]
+
+    assert photos[0] in album_info[0].photos