diff --git a/tests/unit/test_activities.py b/tests/unit/test_activities.py
index 55a89ee..976197b 100644
--- a/tests/unit/test_activities.py
+++ b/tests/unit/test_activities.py
@@ -52,6 +52,22 @@ class TestActivitiesList(TestActivities):
         self.assertEqual(result[1].type, "photo_update")
         self.assertEqual(result[1].data.id, "photo2")
 
+    @mock.patch.object(trovebox.Trovebox, 'get')
+    def test_empty_result(self, mock_get):
+        """Check that an empty result is transformed into an empty list """
+        mock_get.return_value = self._return_value("")
+        result = self.client.activities.list()
+        mock_get.assert_called_with("/activities/list.json")
+        self.assertEqual(result, [])
+
+    @mock.patch.object(trovebox.Trovebox, 'get')
+    def test_zero_rows(self, mock_get):
+        """Check that totalRows=0 is transformed into an empty list """
+        mock_get.return_value = self._return_value([{"totalRows": 0}])
+        result = self.client.activities.list()
+        mock_get.assert_called_with("/activities/list.json")
+        self.assertEqual(result, [])
+
 class TestActivitiesPurge(TestActivities):
     @mock.patch.object(trovebox.Trovebox, 'post')
     def test_activity_purge(self, mock_get):
diff --git a/tests/unit/test_albums.py b/tests/unit/test_albums.py
index db91e31..513500c 100644
--- a/tests/unit/test_albums.py
+++ b/tests/unit/test_albums.py
@@ -39,6 +39,22 @@ class TestAlbumsList(TestAlbums):
         self.assertEqual(result[1].id, "2")
         self.assertEqual(result[1].name, "Album 2")
 
+    @mock.patch.object(trovebox.Trovebox, 'get')
+    def test_empty_result(self, mock_get):
+        """Check that an empty result is transformed into an empty list """
+        mock_get.return_value = self._return_value("")
+        result = self.client.albums.list()
+        mock_get.assert_called_with("/albums/list.json")
+        self.assertEqual(result, [])
+
+    @mock.patch.object(trovebox.Trovebox, 'get')
+    def test_zero_rows(self, mock_get):
+        """Check that totalRows=0 is transformed into an empty list """
+        mock_get.return_value = self._return_value([{"totalRows": 0}])
+        result = self.client.albums.list()
+        mock_get.assert_called_with("/albums/list.json")
+        self.assertEqual(result, [])
+
     @mock.patch.object(trovebox.Trovebox, 'get')
     def test_albums_list_returns_cover_photos(self, mock_get):
         """Check that the album list returns cover photo objects"""
diff --git a/tests/unit/test_photos.py b/tests/unit/test_photos.py
index def92f0..c1ed191 100644
--- a/tests/unit/test_photos.py
+++ b/tests/unit/test_photos.py
@@ -39,6 +39,22 @@ class TestPhotosList(TestPhotos):
         self.assertEqual(result[1].id, "2b")
         self.assertEqual(result[1].tags, ["tag3", "tag4"])
 
+    @mock.patch.object(trovebox.Trovebox, 'get')
+    def test_empty_result(self, mock_get):
+        """Check that an empty result is transformed into an empty list """
+        mock_get.return_value = self._return_value("")
+        result = self.client.photos.list()
+        mock_get.assert_called_with("/photos/list.json")
+        self.assertEqual(result, [])
+
+    @mock.patch.object(trovebox.Trovebox, 'get')
+    def test_zero_rows(self, mock_get):
+        """Check that totalRows=0 is transformed into an empty list """
+        mock_get.return_value = self._return_value([{"totalRows": 0}])
+        result = self.client.photos.list()
+        mock_get.assert_called_with("/photos/list.json")
+        self.assertEqual(result, [])
+
 class TestPhotosUpdate(TestPhotos):
     @mock.patch.object(trovebox.Trovebox, 'post')
     def test_photos_update(self, mock_post):
diff --git a/tests/unit/test_tags.py b/tests/unit/test_tags.py
index e0c469f..fd5b88a 100644
--- a/tests/unit/test_tags.py
+++ b/tests/unit/test_tags.py
@@ -25,7 +25,7 @@ class TestTags(unittest.TestCase):
 class TestTagsList(TestTags):
     @mock.patch.object(trovebox.Trovebox, 'get')
     def test_tags_list(self, mock_get):
-        """Check that the the tag list is returned correctly"""
+        """Check that the tag list is returned correctly"""
         mock_get.return_value = self._return_value(self.test_tags_dict)
         result = self.client.tags.list()
         mock_get.assert_called_with("/tags/list.json")
@@ -35,6 +35,22 @@ class TestTagsList(TestTags):
         self.assertEqual(result[1].id, "tag2")
         self.assertEqual(result[1].count, 5)
 
+    @mock.patch.object(trovebox.Trovebox, 'get')
+    def test_empty_result(self, mock_get):
+        """Check that an empty result is transformed into an empty list """
+        mock_get.return_value = self._return_value("")
+        result = self.client.tags.list()
+        mock_get.assert_called_with("/tags/list.json")
+        self.assertEqual(result, [])
+
+    @mock.patch.object(trovebox.Trovebox, 'get')
+    def test_zero_rows(self, mock_get):
+        """Check that totalRows=0 is transformed into an empty list """
+        mock_get.return_value = self._return_value([{"totalRows": 0}])
+        result = self.client.tags.list()
+        mock_get.assert_called_with("/tags/list.json")
+        self.assertEqual(result, [])
+
 class TestTagCreate(TestTags):
     @mock.patch.object(trovebox.Trovebox, 'post')
     def test_tag_create(self, mock_post):