diff --git a/swh/loader/pypi/tests/resources/0805nexter+new-made-up-release.json b/swh/loader/pypi/tests/resources/0805nexter+new-made-up-release.json
new file mode 100644
--- /dev/null
+++ b/swh/loader/pypi/tests/resources/0805nexter+new-made-up-release.json
@@ -0,0 +1,114 @@
+{
+  "info": {
+    "author": "hgtkpython",
+    "author_email": "2868989685@qq.com",
+    "bugtrack_url": null,
+    "classifiers": [],
+    "description": "UNKNOWN",
+    "description_content_type": null,
+    "docs_url": null,
+    "download_url": "UNKNOWN",
+    "downloads": {
+      "last_day": -1,
+      "last_month": -1,
+      "last_week": -1
+    },
+    "home_page": "http://www.hp.com",
+    "keywords": null,
+    "license": "UNKNOWN",
+    "maintainer": null,
+    "maintainer_email": null,
+    "name": "0805nexter",
+    "package_url": "https://pypi.org/project/0805nexter/",
+    "platform": "UNKNOWN",
+    "project_url": "https://pypi.org/project/0805nexter/",
+    "project_urls": {
+      "Download": "UNKNOWN",
+      "Homepage": "http://www.hp.com"
+    },
+    "release_url": "https://pypi.org/project/0805nexter/1.3.0/",
+    "requires_dist": null,
+    "requires_python": null,
+    "summary": "a simple printer of nested lest",
+    "version": "1.3.0"
+  },
+  "last_serial": 1931736,
+  "releases": {
+    "1.1.0": [
+      {
+        "comment_text": "",
+        "digests": {
+          "md5": "07fc93fc12821c1405c3483db88154af",
+          "sha256": "52cd128ad3afe539478abc7440d4b043384295fbe6b0958a237cb6d926465035"
+        },
+        "downloads": -1,
+        "filename": "0805nexter-1.1.0.zip",
+        "has_sig": false,
+        "md5_digest": "07fc93fc12821c1405c3483db88154af",
+        "packagetype": "sdist",
+        "python_version": "source",
+        "requires_python": null,
+        "size": 862,
+        "upload_time": "2016-01-31T05:28:42",
+        "url": "https://files.pythonhosted.org/packages/ec/65/c0116953c9a3f47de89e71964d6c7b0c783b01f29fa3390584dbf3046b4d/0805nexter-1.1.0.zip"
+      }
+    ],
+    "1.2.0": [
+      {
+        "comment_text": "",
+        "digests": {
+          "md5": "89123c78bd5d3f61cb8f46029492b18a",
+          "sha256": "49785c6ae39ea511b3c253d7621c0b1b6228be2f965aca8a491e6b84126d0709"
+        },
+        "downloads": -1,
+        "filename": "0805nexter-1.2.0.zip",
+        "has_sig": false,
+        "md5_digest": "89123c78bd5d3f61cb8f46029492b18a",
+        "packagetype": "sdist",
+        "python_version": "source",
+        "requires_python": null,
+        "size": 898,
+        "upload_time": "2016-01-31T05:51:25",
+        "url": "https://files.pythonhosted.org/packages/c4/a0/4562cda161dc4ecbbe9e2a11eb365400c0461845c5be70d73869786809c4/0805nexter-1.2.0.zip"
+      }
+    ],
+    "1.3.0": [
+      {
+        "comment_text": "Made up release 1.3.0 for swh-loader-pypi purposes",
+          "digests": {
+          "md5": "54d9750a1ab7ab82cd8c460c2c6c0ecc",
+          "sha256": "7097c49fb8ec24a7aaab54c3dbfbb5a6ca1431419d9ee0f6c363d9ad01d2b8b1"
+        },
+        "downloads": -1,
+        "filename": "0805nexter-1.3.0.zip",
+        "has_sig": false,
+        "md5_digest": "54d9750a1ab7ab82cd8c460c2c6c0ecc",
+        "packagetype": "sdist",
+        "python_version": "source",
+        "requires_python": null,
+        "size": 1370,
+        "upload_time": "2018-09-17T16:18:01",
+        "url": "https://files.pythonhosted.org/packages/70/97/c49fb8ec24a7aaab54c3dbfbb5a6ca1431419d9ee0f6c363d9ad01d2b8b1/0805nexter-1.3.0.zip"
+      }
+    ]
+  },
+  "urls": [
+    {
+      "comment_text": "",
+      "digests": {
+        "md5": "89123c78bd5d3f61cb8f46029492b18a",
+        "sha256": "49785c6ae39ea511b3c253d7621c0b1b6228be2f965aca8a491e6b84126d0709"
+      },
+      "downloads": -1,
+      "filename": "0805nexter-1.2.0.zip",
+      "has_sig": false,
+      "md5_digest": "89123c78bd5d3f61cb8f46029492b18a",
+      "packagetype": "sdist",
+      "python_version": "source",
+      "requires_python": null,
+      "size": 898,
+      "upload_time": "2016-01-31T05:51:25",
+      "url": "https://files.pythonhosted.org/packages/c4/a0/4562cda161dc4ecbbe9e2a11eb365400c0461845c5be70d73869786809c4/0805nexter-1.2.0.zip"
+    }
+  ]
+}
diff --git a/swh/loader/pypi/tests/resources/0805nexter-unpublished-release.json b/swh/loader/pypi/tests/resources/0805nexter-unpublished-release.json
new file mode 100644
--- /dev/null
+++ b/swh/loader/pypi/tests/resources/0805nexter-unpublished-release.json
@@ -0,0 +1,116 @@
+{
+  "info": {
+    "author": "hgtkpython",
+    "author_email": "2868989685@qq.com",
+    "bugtrack_url": null,
+    "classifiers": [],
+    "description": "UNKNOWN",
+    "description_content_type": null,
+    "docs_url": null,
+    "download_url": "UNKNOWN",
+    "downloads": {
+      "last_day": -1,
+      "last_month": -1,
+      "last_week": -1
+    },
+    "home_page": "http://www.hp.com",
+    "keywords": null,
+    "license": "UNKNOWN",
+    "maintainer": null,
+    "maintainer_email": null,
+    "name": "0805nexter",
+    "package_url": "https://pypi.org/project/0805nexter/",
+    "platform": "UNKNOWN",
+    "project_url": "https://pypi.org/project/0805nexter/",
+    "project_urls": {
+      "Download": "UNKNOWN",
+      "Homepage": "http://www.hp.com"
+    },
+    "release_url": "https://pypi.org/project/0805nexter/1.4.0/",
+    "requires_dist": null,
+    "requires_python": null,
+    "summary": "a simple printer of nested lest",
+    "version": "1.4.0"
+  },
+  "last_serial": 1931736,
+  "releases": {
+    "1.1.0": [],
+    "1.2.0": [
+      {
+        "comment_text": "",
+        "digests": {
+          "md5": "89123c78bd5d3f61cb8f46029492b18a",
+          "sha256": "49785c6ae39ea511b3c253d7621c0b1b6228be2f965aca8a491e6b84126d0709"
+        },
+        "downloads": -1,
+        "filename": "0805nexter-1.2.0.zip",
+        "has_sig": false,
+        "md5_digest": "89123c78bd5d3f61cb8f46029492b18a",
+        "packagetype": "sdist",
+        "python_version": "source",
+        "requires_python": null,
+        "size": 898,
+        "upload_time": "2016-01-31T05:51:25",
+        "url": "https://files.pythonhosted.org/packages/c4/a0/4562cda161dc4ecbbe9e2a11eb365400c0461845c5be70d73869786809c4/0805nexter-1.2.0.zip"
+      }
+    ],
+    "1.3.0": [
+      {
+        "comment_text": "Made up release 1.3.0 for swh-loader-pypi purposes",
+          "digests": {
+          "md5": "54d9750a1ab7ab82cd8c460c2c6c0ecc",
+          "sha256": "7097c49fb8ec24a7aaab54c3dbfbb5a6ca1431419d9ee0f6c363d9ad01d2b8b1"
+        },
+        "downloads": -1,
+        "filename": "0805nexter-1.3.0.zip",
+        "has_sig": false,
+        "md5_digest": "54d9750a1ab7ab82cd8c460c2c6c0ecc",
+        "packagetype": "sdist",
+        "python_version": "source",
+        "requires_python": null,
+        "size": 1370,
+        "upload_time": "2018-09-17T16:18:01",
+        "url": "https://files.pythonhosted.org/packages/70/97/c49fb8ec24a7aaab54c3dbfbb5a6ca1431419d9ee0f6c363d9ad01d2b8b1/0805nexter-1.3.0.zip"
+      }
+    ],
+    "1.4.0": [
+      {
+        "comment_text": "1.4.0: Made up release for swh-loader-pypi test purposes",
+          "digests": {
+          "md5": "a30afef2f605ea837e6d5820412d5a7b",
+          "sha256": "4f6e85d0f9f04c00429ddcb25530f5c125fa169bd470cda9f04daa40862eb712"
+        },
+        "downloads": -1,
+        "filename": "0805nexter-1.4.0.zip",
+        "has_sig": false,
+        "md5_digest": "54d9750a1ab7ab82cd8c460c2c6c0ecc",
+        "packagetype": "sdist",
+        "python_version": "source",
+        "requires_python": null,
+        "size": 1370,
+        "upload_time": "2018-09-18T09:18:01",
+        "url": "https://files.pythonhosted.org/packages/4f/6e/85d0f9f04c00429ddcb25530f5c125fa169bd470cda9f04daa40862eb712/0805nexter-1.4.0.zip"
+      }
+    ]
+
+  },
+  "urls": [
+    {
+      "comment_text": "",
+      "digests": {
+        "md5": "89123c78bd5d3f61cb8f46029492b18a",
+        "sha256": "49785c6ae39ea511b3c253d7621c0b1b6228be2f965aca8a491e6b84126d0709"
+      },
+      "downloads": -1,
+      "filename": "0805nexter-1.2.0.zip",
+      "has_sig": false,
+      "md5_digest": "89123c78bd5d3f61cb8f46029492b18a",
+      "packagetype": "sdist",
+      "python_version": "source",
+      "requires_python": null,
+      "size": 898,
+      "upload_time": "2016-01-31T05:51:25",
+      "url": "https://files.pythonhosted.org/packages/c4/a0/4562cda161dc4ecbbe9e2a11eb365400c0461845c5be70d73869786809c4/0805nexter-1.2.0.zip"
+    }
+  ]
+}
diff --git a/swh/loader/pypi/tests/resources/0805nexter.json b/swh/loader/pypi/tests/resources/0805nexter.json
--- a/swh/loader/pypi/tests/resources/0805nexter.json
+++ b/swh/loader/pypi/tests/resources/0805nexter.json
@@ -1 +1,95 @@
-{"info":{"author":"hgtkpython","author_email":"2868989685@qq.com","bugtrack_url":null,"classifiers":[],"description":"UNKNOWN","description_content_type":null,"docs_url":null,"download_url":"UNKNOWN","downloads":{"last_day":-1,"last_month":-1,"last_week":-1},"home_page":"http://www.hp.com","keywords":null,"license":"UNKNOWN","maintainer":null,"maintainer_email":null,"name":"0805nexter","package_url":"https://pypi.org/project/0805nexter/","platform":"UNKNOWN","project_url":"https://pypi.org/project/0805nexter/","project_urls":{"Download":"UNKNOWN","Homepage":"http://www.hp.com"},"release_url":"https://pypi.org/project/0805nexter/1.2.0/","requires_dist":null,"requires_python":null,"summary":"a simple printer of nested lest","version":"1.2.0"},"last_serial":1931736,"releases":{"1.1.0":[{"comment_text":"","digests":{"md5":"07fc93fc12821c1405c3483db88154af","sha256":"52cd128ad3afe539478abc7440d4b043384295fbe6b0958a237cb6d926465035"},"downloads":-1,"filename":"0805nexter-1.1.0.zip","has_sig":false,"md5_digest":"07fc93fc12821c1405c3483db88154af","packagetype":"sdist","python_version":"source","requires_python":null,"size":862,"upload_time":"2016-01-31T05:28:42","url":"https://files.pythonhosted.org/packages/ec/65/c0116953c9a3f47de89e71964d6c7b0c783b01f29fa3390584dbf3046b4d/0805nexter-1.1.0.zip"}],"1.2.0":[{"comment_text":"","digests":{"md5":"89123c78bd5d3f61cb8f46029492b18a","sha256":"49785c6ae39ea511b3c253d7621c0b1b6228be2f965aca8a491e6b84126d0709"},"downloads":-1,"filename":"0805nexter-1.2.0.zip","has_sig":false,"md5_digest":"89123c78bd5d3f61cb8f46029492b18a","packagetype":"sdist","python_version":"source","requires_python":null,"size":898,"upload_time":"2016-01-31T05:51:25","url":"https://files.pythonhosted.org/packages/c4/a0/4562cda161dc4ecbbe9e2a11eb365400c0461845c5be70d73869786809c4/0805nexter-1.2.0.zip"}]},"urls":[{"comment_text":"","digests":{"md5":"89123c78bd5d3f61cb8f46029492b18a","sha256":"49785c6ae39ea511b3c253d7621c0b1b6228be2f965aca8a491e6b84126d0709"},"downloads":-1,"filename":"0805nexter-1.2.0.zip","has_sig":false,"md5_digest":"89123c78bd5d3f61cb8f46029492b18a","packagetype":"sdist","python_version":"source","requires_python":null,"size":898,"upload_time":"2016-01-31T05:51:25","url":"https://files.pythonhosted.org/packages/c4/a0/4562cda161dc4ecbbe9e2a11eb365400c0461845c5be70d73869786809c4/0805nexter-1.2.0.zip"}]}
\ No newline at end of file
+{
+  "info": {
+    "author": "hgtkpython",
+    "author_email": "2868989685@qq.com",
+    "bugtrack_url": null,
+    "classifiers": [],
+    "description": "UNKNOWN",
+    "description_content_type": null,
+    "docs_url": null,
+    "download_url": "UNKNOWN",
+    "downloads": {
+      "last_day": -1,
+      "last_month": -1,
+      "last_week": -1
+    },
+    "home_page": "http://www.hp.com",
+    "keywords": null,
+    "license": "UNKNOWN",
+    "maintainer": null,
+    "maintainer_email": null,
+    "name": "0805nexter",
+    "package_url": "https://pypi.org/project/0805nexter/",
+    "platform": "UNKNOWN",
+    "project_url": "https://pypi.org/project/0805nexter/",
+    "project_urls": {
+      "Download": "UNKNOWN",
+      "Homepage": "http://www.hp.com"
+    },
+    "release_url": "https://pypi.org/project/0805nexter/1.2.0/",
+    "requires_dist": null,
+    "requires_python": null,
+    "summary": "a simple printer of nested lest",
+    "version": "1.2.0"
+  },
+  "last_serial": 1931736,
+  "releases": {
+    "1.1.0": [
+      {
+        "comment_text": "",
+        "digests": {
+          "md5": "07fc93fc12821c1405c3483db88154af",
+          "sha256": "52cd128ad3afe539478abc7440d4b043384295fbe6b0958a237cb6d926465035"
+        },
+        "downloads": -1,
+        "filename": "0805nexter-1.1.0.zip",
+        "has_sig": false,
+        "md5_digest": "07fc93fc12821c1405c3483db88154af",
+        "packagetype": "sdist",
+        "python_version": "source",
+        "requires_python": null,
+        "size": 862,
+        "upload_time": "2016-01-31T05:28:42",
+        "url": "https://files.pythonhosted.org/packages/ec/65/c0116953c9a3f47de89e71964d6c7b0c783b01f29fa3390584dbf3046b4d/0805nexter-1.1.0.zip"
+      }
+    ],
+    "1.2.0": [
+      {
+        "comment_text": "",
+        "digests": {
+          "md5": "89123c78bd5d3f61cb8f46029492b18a",
+          "sha256": "49785c6ae39ea511b3c253d7621c0b1b6228be2f965aca8a491e6b84126d0709"
+        },
+        "downloads": -1,
+        "filename": "0805nexter-1.2.0.zip",
+        "has_sig": false,
+        "md5_digest": "89123c78bd5d3f61cb8f46029492b18a",
+        "packagetype": "sdist",
+        "python_version": "source",
+        "requires_python": null,
+        "size": 898,
+        "upload_time": "2016-01-31T05:51:25",
+        "url": "https://files.pythonhosted.org/packages/c4/a0/4562cda161dc4ecbbe9e2a11eb365400c0461845c5be70d73869786809c4/0805nexter-1.2.0.zip"
+      }
+    ]
+  },
+  "urls": [
+    {
+      "comment_text": "",
+      "digests": {
+        "md5": "89123c78bd5d3f61cb8f46029492b18a",
+        "sha256": "49785c6ae39ea511b3c253d7621c0b1b6228be2f965aca8a491e6b84126d0709"
+      },
+      "downloads": -1,
+      "filename": "0805nexter-1.2.0.zip",
+      "has_sig": false,
+      "md5_digest": "89123c78bd5d3f61cb8f46029492b18a",
+      "packagetype": "sdist",
+      "python_version": "source",
+      "requires_python": null,
+      "size": 898,
+      "upload_time": "2016-01-31T05:51:25",
+      "url": "https://files.pythonhosted.org/packages/c4/a0/4562cda161dc4ecbbe9e2a11eb365400c0461845c5be70d73869786809c4/0805nexter-1.2.0.zip"
+    }
+  ]
+}
diff --git a/swh/loader/pypi/tests/resources/archives/0805nexter-1.1.0.zip b/swh/loader/pypi/tests/resources/archives/0805nexter-1.1.0.zip
new file mode 100644
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001

literal 0
Hc$@<O00001

diff --git a/swh/loader/pypi/tests/resources/archives/0805nexter-1.2.0.zip b/swh/loader/pypi/tests/resources/archives/0805nexter-1.2.0.zip
new file mode 100644
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001

literal 0
Hc$@<O00001

diff --git a/swh/loader/pypi/tests/resources/archives/0805nexter-1.3.0.zip b/swh/loader/pypi/tests/resources/archives/0805nexter-1.3.0.zip
new file mode 100644
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001

literal 0
Hc$@<O00001

diff --git a/swh/loader/pypi/tests/resources/archives/0805nexter-1.4.0.zip b/swh/loader/pypi/tests/resources/archives/0805nexter-1.4.0.zip
new file mode 100644
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001

literal 0
Hc$@<O00001

diff --git a/swh/loader/pypi/tests/test_loader.py b/swh/loader/pypi/tests/test_loader.py
--- a/swh/loader/pypi/tests/test_loader.py
+++ b/swh/loader/pypi/tests/test_loader.py
@@ -23,8 +23,10 @@
        inhibited)
 
     """
-    def __init__(self, project_name):
-        project_metadata_file = '%s/%s.json' % (RESOURCES_PATH, project_name)
+    def __init__(self, project_name, json_filename=None):
+        if not json_filename:  # defaulting to using same name as project
+            json_filename = '%s.json' % project_name
+        project_metadata_file = '%s/%s' % (RESOURCES_PATH, json_filename)
         project_metadata_url = 'https://pypi.org/pypi/%s/json' % project_name
         with open(project_metadata_file) as f:
             data = json.load(f)
@@ -61,7 +63,6 @@
     def setUp(self, project_name='0805nexter',
               dummy_pypi_instance='https://dummy.org'):
         self.tmp_root_path = tempfile.mkdtemp()
-        self.loader = PyPILoaderNoSnapshot(project_name=project_name)
         self._project = project_name
         self._origin_url = '%s/pypi/%s/' % (dummy_pypi_instance, project_name)
         self._project_metadata_url = '%s/pypi/%s/json' % (
@@ -191,10 +192,12 @@
 
 
 class PyPILoaderWithSnapshot(TestPyPILoader):
-    """Same as TestPyPILoader with no prior snapshot seen
+    """This loader provides a snapshot and lists corresponding seen
+       release artifacts.
 
     """
     def _last_snapshot(self):
+        """Return last visited snapshot"""
         return {
             'id': b'\xf4V\xb0>\x8b\xf1\x92\rd\xb0\r\xf24\xb1\xef\xed\xc2[l\x93',  # noqa
             'branches': {
@@ -213,6 +216,7 @@
         }
 
     def _known_artifacts(self, last_snapshot):
+        """List corresponding seen release artifacts"""
         yield from [
             (
                 '0805nexter-1.1.0.zip',
@@ -225,7 +229,13 @@
         ]
 
 
-class LoaderWithOriginAlreadySeenITest(BaseLoaderITest):
+class LoaderNoNewChangesSinceLastVisitITest(BaseLoaderITest):
+    """This scenario makes use of the incremental nature of the loader.
+
+    If nothing changes in between visits, the snapshot for the visit
+    must stay the same as the first visit.
+
+    """
     def setUp(self, project_name='0805nexter',
               dummy_pypi_instance='https://dummy.org'):
         super().setUp(project_name, dummy_pypi_instance)
@@ -233,7 +243,7 @@
 
     @istest
     def load(self):
-        """Load a pypi origin already injected will result with only 1 snapshot
+        """Load a PyPI origin without new changes results in 1 same snapshot
 
         """
         # when
@@ -255,5 +265,213 @@
             '4c99891f93b81450385777235a37b5e966dd1571': '05219ba38bc542d4345d5638af1ed56c7d43ca7d',  # noqa
             'e445da4da22b31bfebb6ffc4383dbf839a074d21': 'b178b66bd22383d5f16f4f5c923d39ca798861b4',  # noqa
         }
+        expected_snapshot_id = 'f456b03e8bf1920d64b00df234b1efedc25b6c93'
         self.assertSnapshotOk('f456b03e8bf1920d64b00df234b1efedc25b6c93',
                               expected_revisions)
+
+        _id = hashutil.hash_to_hex(self.loader._last_snapshot()['id'])
+        self.assertEquals(expected_snapshot_id, _id)
+
+
+class LoaderNewChangesSinceLastVisitITest(BaseLoaderITest):
+    """In this scenario, a visit has already taken place.
+    An existing snapshot exists.
+
+    This time, the PyPI project has changed, a new release (with 1 new
+    release artifact) has been uploaded. The old releases did not
+    change.
+
+    The visit results in a new snapshot.
+
+    The new snapshot shares the same history as prior visit's
+    snapshot. It holds a new branch targetting the new revision.
+
+    """
+    def setUp(self, project_name='0805nexter',
+              dummy_pypi_instance='https://dummy.org'):
+        super().setUp(project_name, dummy_pypi_instance)
+        self.loader = PyPILoaderWithSnapshot(
+            project_name=project_name,
+            json_filename='0805nexter+new-made-up-release.json')
+
+    @istest
+    def load(self):
+        """Load a PyPI origin with changes results in 1 new snapshot
+
+        """
+        # when
+        self.loader.load(
+            self._project, self._origin_url, self._project_metadata_url)
+
+        # then
+        self.assertEquals(
+            len(self.loader.all_contents), 4,
+            "3 + 1 new content (only change between 1.2.0 and 1.3.0 archives)")
+        self.assertEquals(len(self.loader.all_directories), 2)
+        self.assertEquals(
+            len(self.loader.all_revisions), 1,
+            "This results in 1 new revision targetting that new directory id")
+        self.assertEquals(len(self.loader.all_releases), 0)
+        self.assertEquals(len(self.loader.all_snapshots), 1)
+
+        expected_contents = [
+            '92689fa2b7fb4d4fc6fb195bf73a50c87c030639',  # new one
+            '405859113963cb7a797642b45f171d6360425d16',
+            '83ecf6ec1114fd260ca7a833a2d165e71258c338',
+            'e5686aa568fdb1d19d7f1329267082fe40482d31',
+        ]
+
+        self.assertContentsOk(expected_contents)
+
+        expected_directories = [
+            'e226e7e4ad03b4fc1403d69a18ebdd6f2edd2b3a',
+            '52604d46843b898f5a43208045d09fcf8731631b',
+        ]
+        self.assertDirectoriesOk(expected_directories)
+
+        expected_revisions = {
+            'fb46e49605b0bbe69f8c53d315e89370e7c6cb5d': 'e226e7e4ad03b4fc1403d69a18ebdd6f2edd2b3a',  # noqa
+        }
+        self.assertRevisionsOk(expected_revisions)
+
+        old_revisions = {
+            '4c99891f93b81450385777235a37b5e966dd1571': '05219ba38bc542d4345d5638af1ed56c7d43ca7d',  # noqa
+            'e445da4da22b31bfebb6ffc4383dbf839a074d21': 'b178b66bd22383d5f16f4f5c923d39ca798861b4',  # noqa
+        }
+        for rev, dir_id in old_revisions.items():
+            expected_revisions[rev] = dir_id
+
+        expected_snapshot_id = 'e5beda90e9ddbc8672734ed172246b06fcbc6827'
+        self.assertSnapshotOk(expected_snapshot_id, expected_revisions)
+
+        _id = hashutil.hash_to_hex(self.loader._last_snapshot()['id'])
+        self.assertNotEqual(expected_snapshot_id, _id)
+
+
+class PyPILoaderWithSnapshot2(TestPyPILoader):
+    """This loader provides a snapshot and lists corresponding seen
+       release artifacts.
+
+    """
+    def _last_snapshot(self):
+        """Return last visited snapshot"""
+        return {
+            'id': b"\xe5\xbe\xda\x90\xe9\xdd\xbc\x86rsN\xd1r$k\x06\xfc\xbch'",
+            'branches': {
+                b'0805nexter-1.1.0.zip': {
+                    'target': b'L\x99\x89\x1f\x93\xb8\x14P8Ww#Z7\xb5\xe9f\xdd\x15q',  # noqa
+                    'target_type': 'revision'
+                },
+                b'0805nexter-1.2.0.zip': {
+                    'target': b'\xe4E\xdaM\xa2+1\xbf\xeb\xb6\xff\xc48=\xbf\x83\x9a\x07M!',  # noqa
+                    'target_type': 'revision'
+                },
+                b'0805nexter-1.3.0.zip': {
+                    'target': b'\xfbF\xe4\x96\x05\xb0\xbb\xe6\x9f\x8cS\xd3\x15\xe8\x93p\xe7\xc6\xcb]',  # noqa
+                    'target_type': 'revision'
+                }
+            }
+        }
+
+    def _known_artifacts(self, last_snapshot):
+        """List corresponding seen release artifacts"""
+        return [
+            (
+                '0805nexter-1.1.0.zip',
+                '52cd128ad3afe539478abc7440d4b043384295fbe6b0958a237cb6d926465035'  # noqa
+            ),
+            (
+                '0805nexter-1.2.0.zip',
+                '49785c6ae39ea511b3c253d7621c0b1b6228be2f965aca8a491e6b84126d0709'  # noqa
+            ),
+            (
+                '0805nexter-1.3.0.zip',
+                '7097c49fb8ec24a7aaab54c3dbfbb5a6ca1431419d9ee0f6c363d9ad01d2b8b1'  # noqa
+            )
+        ]
+
+
+class LoaderChangesOldReleaseArtifactRemovedSinceLastVisit(BaseLoaderITest):
+    """In this scenario, a visit has already taken place.  An existing
+    snapshot exists.
+
+    The PyPI project has changed:
+    - a new release has been uploaded
+    - an older one has been removed
+
+    # What wrongly happens now
+
+    The visit results in a new snapshot, such snapshot shares the same
+    branches as last visit's snapshot (including the unpublished
+    release artifacts).
+
+    # What should happen:
+
+    The visit should result in a new snapshot. Such snapshot shares some of
+    the same branches as prior visit (but not all):
+
+    - new release artifact branch exists
+    - old release artifact branch has been removed
+    - the other unchanged release artifact branches are left unchanged
+
+    """
+    def setUp(self, project_name='0805nexter',
+              dummy_pypi_instance='https://dummy.org'):
+        super().setUp(project_name, dummy_pypi_instance)
+        self.loader = PyPILoaderWithSnapshot2(
+            project_name=project_name,
+            json_filename='0805nexter-unpublished-release.json')
+
+    @istest
+    def load(self):
+        """Load PyPI origin with removed artifact + changes ~> 1 new snapshot
+
+        """
+        # when
+        self.loader.load(
+            self._project, self._origin_url, self._project_metadata_url)
+
+        # then
+        self.assertEquals(
+            len(self.loader.all_contents), 4,
+            "3 + 1 new content (only change between 1.3.0 and 1.4.0 archives)")
+        self.assertEquals(len(self.loader.all_directories), 2)
+        self.assertEquals(
+            len(self.loader.all_revisions), 1,
+            "This results in 1 new revision targetting that new directory id")
+        self.assertEquals(len(self.loader.all_releases), 0)
+        self.assertEquals(len(self.loader.all_snapshots), 1)
+
+        expected_contents = [
+            'e2d68a197e3a3ad0fc6de28749077892c2148043',  # new one
+            '405859113963cb7a797642b45f171d6360425d16',
+            '83ecf6ec1114fd260ca7a833a2d165e71258c338',
+            'e5686aa568fdb1d19d7f1329267082fe40482d31',
+        ]
+
+        self.assertContentsOk(expected_contents)
+
+        expected_directories = [
+            'a2b7621f3e52eb3632657f6e3436bd08202db56f',  # new one
+            '770e21215ecac53cea331d8ea4dc0ffc9d979367',
+        ]
+        self.assertDirectoriesOk(expected_directories)
+
+        expected_revisions = {
+            '5e91875f096ac48c98d74acf307439a3490f2827': '770e21215ecac53cea331d8ea4dc0ffc9d979367',  # noqa
+        }
+        self.assertRevisionsOk(expected_revisions)
+
+        old_revisions = {
+            '4c99891f93b81450385777235a37b5e966dd1571': '05219ba38bc542d4345d5638af1ed56c7d43ca7d',  # noqa
+            'e445da4da22b31bfebb6ffc4383dbf839a074d21': 'b178b66bd22383d5f16f4f5c923d39ca798861b4',  # noqa
+            'fb46e49605b0bbe69f8c53d315e89370e7c6cb5d': 'e226e7e4ad03b4fc1403d69a18ebdd6f2edd2b3a',  # noqa
+        }
+        for rev, dir_id in old_revisions.items():
+            expected_revisions[rev] = dir_id
+
+        expected_snapshot_id = '0f36392a2c825bafa766b371f2485f9549eec41c'
+        self.assertSnapshotOk(expected_snapshot_id, expected_revisions)
+
+        _id = hashutil.hash_to_hex(self.loader._last_snapshot()['id'])
+        self.assertNotEqual(expected_snapshot_id, _id)