diff --git a/swh/deposit/tests/api/test_deposit_atom.py b/swh/deposit/tests/api/test_deposit_atom.py
index 3ea7dd2b..7048cb19 100644
--- a/swh/deposit/tests/api/test_deposit_atom.py
+++ b/swh/deposit/tests/api/test_deposit_atom.py
@@ -1,209 +1,248 @@
 # Copyright (C) 2017  The Software Heritage developers
 # See the AUTHORS file at the top-level directory of this distribution
 # License: GNU General Public License version 3, or any later version
 # See top-level LICENSE file for more information
 
 from django.core.urlresolvers import reverse
 from io import BytesIO
 from rest_framework import status
 from rest_framework.test import APITestCase
 
 from swh.deposit.config import COL_IRI
 from swh.deposit.models import Deposit, DepositRequest
 from swh.deposit.parsers import parse_xml
 
 from ..common import BasicTestCase, WithAuthTestCase
 
 
 class DepositAtomEntryTestCase(APITestCase, WithAuthTestCase, BasicTestCase):
     """Try and post atom entry deposit.
 
     """
     def setUp(self):
         super().setUp()
 
         self.atom_entry_data0 = b"""<?xml version="1.0"?>
 <entry xmlns="http://www.w3.org/2005/Atom">
     <title>Awesome Compiler</title>
     <client>hal</client>
     <id>urn:uuid:1225c695-cfb8-4ebb-aaaa-80da344efa6a</id>
     <external_identifier>%s</external_identifier>
     <updated>2017-10-07T15:17:08Z</updated>
     <author>some awesome author</author>
     <applicationCategory>something</applicationCategory>
     <name>awesome-compiler</name>
     <description>This is an awesome compiler destined to
 awesomely compile stuff
 and other stuff</description>
     <keywords>compiler,programming,language</keywords>
     <dateCreated>2005-10-07T17:17:08Z</dateCreated>
     <datePublished>2005-10-07T17:17:08Z</datePublished>
     <releaseNotes>release note</releaseNotes>
     <relatedLink>related link</relatedLink>
     <sponsor></sponsor>
     <programmingLanguage>Awesome</programmingLanguage>
     <codeRepository>https://hoster.org/awesome-compiler</codeRepository>
     <operatingSystem>GNU/Linux</operatingSystem>
     <version>0.0.1</version>
     <developmentStatus>running</developmentStatus>
     <runtimePlatform>all</runtimePlatform>
 </entry>"""
 
         self.atom_entry_data1 = b"""<?xml version="1.0"?>
 <entry xmlns="http://www.w3.org/2005/Atom">
     <client>hal</client>
     <id>urn:uuid:2225c695-cfb8-4ebb-aaaa-80da344efa6a</id>
     <updated>2017-10-07T15:17:08Z</updated>
     <author>some awesome author</author>
     <applicationCategory>something</applicationCategory>
     <name>awesome-compiler</name>
     <description>This is an awesome compiler destined to
 awesomely compile stuff
 and other stuff</description>
     <keywords>compiler,programming,language</keywords>
     <dateCreated>2005-10-07T17:17:08Z</dateCreated>
     <datePublished>2005-10-07T17:17:08Z</datePublished>
     <releaseNotes>release note</releaseNotes>
     <relatedLink>related link</relatedLink>
     <sponsor></sponsor>
     <programmingLanguage>Awesome</programmingLanguage>
     <codeRepository>https://hoster.org/awesome-compiler</codeRepository>
     <operatingSystem>GNU/Linux</operatingSystem>
     <version>0.0.1</version>
     <developmentStatus>running</developmentStatus>
     <runtimePlatform>all</runtimePlatform>
 </entry>"""
 
         self.atom_entry_data2 = b"""<?xml version="1.0"?>
 <entry xmlns="http://www.w3.org/2005/Atom">
     <external_identifier>%s</external_identifier>
 </entry>"""
 
         self.atom_entry_data_empty_body = b"""<?xml version="1.0"?>
 <entry xmlns="http://www.w3.org/2005/Atom"></entry>"""
 
         self.atom_entry_data3 = b"""<?xml version="1.0"?>
 <entry xmlns="http://www.w3.org/2005/Atom">
     <something>something</something>
 </entry>"""
 
+        self.atom_entry_tei = b"""<TEI><teiHeader><fileDesc><titleStmt><title>HAL TEI export of hal-01587083</title></titleStmt><publicationStmt><distributor>CCSD</distributor><availability status="restricted"><licence target="http://creativecommons.org/licenses/by/4.0/">Distributed under a Creative Commons Attribution 4.0 International License</licence></availability><date when="2017-10-03T17:21:03+02:00"/></publicationStmt><sourceDesc><p part="N">HAL API platform</p></sourceDesc></fileDesc></teiHeader><text><body><listBibl><biblFull><titleStmt><title xml:lang="en">questionnaire software metadata</title><author role="aut"><persName><forename type="first">Morane</forename><surname>Gruenpeter</surname></persName><email type="md5">7de56c632362954fa84172cad80afe4e</email><email type="domain">inria.fr</email><ptr type="url" target="moranegg.github.io"/><idno type="halauthorid">1556733</idno><affiliation ref="#struct-474639"/></author><editor role="depositor"><persName><forename>Morane</forename><surname>Gruenpeter</surname></persName><email type="md5">f85a43a5fb4a2e0778a77e017f28c8fd</email><email type="domain">gmail.com</email></editor></titleStmt><editionStmt><edition n="v1" type="current"><date type="whenSubmitted">2017-09-29 11:21:32</date><date type="whenModified">2017-10-03 17:20:13</date><date type="whenReleased">2017-10-03 17:20:13</date><date type="whenProduced">2017-09-29</date><date type="whenEndEmbargoed">2017-09-29</date><ref type="file" target="https://hal.inria.fr/hal-01587083/document"><date notBefore="2017-09-29"/></ref><ref type="file" subtype="author" n="1" target="https://hal.inria.fr/hal-01587083/file/questionnaire.zip"><date notBefore="2017-09-29"/></ref></edition><respStmt><resp>contributor</resp><name key="442239"><persName><forename>Morane</forename><surname>Gruenpeter</surname></persName><email type="md5">f85a43a5fb4a2e0778a77e017f28c8fd</email><email type="domain">gmail.com</email></name></respStmt></editionStmt><publicationStmt><distributor>CCSD</distributor><idno type="halId">hal-01587083</idno><idno type="halUri">https://hal.inria.fr/hal-01587083</idno><idno type="halBibtex">gruenpeter:hal-01587083</idno><idno type="halRefHtml">2017</idno><idno type="halRef">2017</idno></publicationStmt><seriesStmt/><notesStmt/><sourceDesc><biblStruct><analytic><title xml:lang="en">questionnaire software metadata</title><author role="aut"><persName><forename type="first">Morane</forename><surname>Gruenpeter</surname></persName><email type="md5">7de56c632362954fa84172cad80afe4e</email><email type="domain">inria.fr</email><ptr type="url" target="moranegg.github.io"/><idno type="halauthorid">1556733</idno><affiliation ref="#struct-474639"/></author></analytic><monogr><imprint/></monogr></biblStruct></sourceDesc><profileDesc><langUsage><language ident="en">English</language></langUsage><textClass><classCode scheme="halDomain" n="info">Computer Science [cs]</classCode><classCode scheme="halTypology" n="SOFTWARE">Software</classCode></textClass></profileDesc></biblFull></listBibl></body><back><listOrg type="structures"><org type="laboratory" xml:id="struct-474639" status="VALID"><orgName>IRILL</orgName><orgName type="acronym">Initiative pour la Recherche et l'Innovation sur le Logiciel Libre</orgName><desc><address><country key="FR"/></address><ref type="url">https://www.irill.org/</ref></desc><listRelation><relation active="#struct-93591" type="direct"/><relation active="#struct-300009" type="direct"/><relation active="#struct-300301" type="direct"/></listRelation></org><org type="institution" xml:id="struct-93591" status="VALID"><orgName>Universite Pierre et Marie Curie - Paris 6</orgName><orgName type="acronym">UPMC</orgName><desc><address><addrLine>4 place Jussieu - 75005 Paris</addrLine><country key="FR"/></address><ref type="url">http://www.upmc.fr/</ref></desc></org><org type="institution" xml:id="struct-300009" status="VALID"><orgName>Institut National de Recherche en Informatique et en Automatique</orgName><orgName type="acronym">Inria</orgName><desc><address><addrLine>Domaine de VoluceauRocquencourt - BP 10578153 Le Chesnay Cedex</addrLine><country key="FR"/></address><ref type="url">http://www.inria.fr/en/</ref></desc></org><org type="institution" xml:id="struct-300301" status="VALID"><orgName>Universite Paris Diderot - Paris 7</orgName><orgName type="acronym">UPD7</orgName><desc><address><addrLine>5 rue Thomas-Mann - 75205 Paris cedex 13</addrLine><country key="FR"/></address><ref type="url">http://www.univ-paris-diderot.fr</ref></desc></org></listOrg></back></text></TEI>"""  # noqa
+
     def test_post_deposit_atom_empty_body_request(self):
         response = self.client.post(
             reverse(COL_IRI, args=[self.username]),
             content_type='application/atom+xml;type=entry',
             data=self.atom_entry_data_empty_body)
         self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
 
     def test_post_deposit_atom_unknown_collection(self):
         response = self.client.post(
             reverse(COL_IRI, args=['unknown-one']),
             content_type='application/atom+xml;type=entry',
             data=self.atom_entry_data3,
             HTTP_SLUG='something')
         self.assertEqual(response.status_code, status.HTTP_404_NOT_FOUND)
 
     def test_post_deposit_atom_entry_initial(self):
         """One deposit upload as atom entry
 
         """
         # given
         external_id = 'urn:uuid:1225c695-cfb8-4ebb-aaaa-80da344efa6a'
 
         with self.assertRaises(Deposit.DoesNotExist):
             Deposit.objects.get(external_id=external_id)
 
         atom_entry_data = self.atom_entry_data0 % external_id.encode('utf-8')
 
         # when
         response = self.client.post(
             reverse(COL_IRI, args=[self.username]),
             content_type='application/atom+xml;type=entry',
             data=atom_entry_data,
             HTTP_IN_PROGRESS='false')
 
         # then
         self.assertEqual(response.status_code, status.HTTP_201_CREATED)
 
         response_content = parse_xml(BytesIO(response.content))
         deposit_id = response_content[
             '{http://www.w3.org/2005/Atom}deposit_id']
 
         deposit = Deposit.objects.get(pk=deposit_id)
         self.assertEqual(deposit.collection, self.collection)
         self.assertEqual(deposit.external_id, external_id)
         self.assertEqual(deposit.status, 'ready')
         self.assertEqual(deposit.client, self.user)
 
         # one associated request to a deposit
         deposit_request = DepositRequest.objects.get(deposit=deposit)
         self.assertIsNotNone(deposit_request.metadata)
         self.assertFalse(bool(deposit_request.archive))
 
+    def test_post_deposit_atom_entry_tei(self):
+        """One deposit upload as atom entry
+
+        """
+        # given
+        external_id = 'urn:uuid:1225c695-cfb8-4ebb-aaaa-80da344efa6a'
+        with self.assertRaises(Deposit.DoesNotExist):
+            Deposit.objects.get(external_id=external_id)
+
+        atom_entry_data = self.atom_entry_tei
+
+        # when
+        response = self.client.post(
+            reverse(COL_IRI, args=[self.username]),
+            content_type='application/atom+xml;type=entry',
+            data=atom_entry_data,
+            HTTP_SLUG=external_id,
+            HTTP_IN_PROGRESS='false')
+
+        # then
+        self.assertEqual(response.status_code, status.HTTP_201_CREATED)
+
+        response_content = parse_xml(BytesIO(response.content))
+        deposit_id = response_content[
+            '{http://www.w3.org/2005/Atom}deposit_id']
+
+        deposit = Deposit.objects.get(pk=deposit_id)
+        self.assertEqual(deposit.collection, self.collection)
+        self.assertEqual(deposit.external_id, external_id)
+        self.assertEqual(deposit.status, 'ready')
+        self.assertEqual(deposit.client, self.user)
+
+        # one associated request to a deposit
+        deposit_request = DepositRequest.objects.get(deposit=deposit)
+        self.assertIsNotNone(deposit_request.metadata)
+        self.assertFalse(bool(deposit_request.archive))
+
     def test_post_deposit_atom_entry_multiple_steps(self):
         """Test one deposit upload."""
         # given
         external_id = 'urn:uuid:2225c695-cfb8-4ebb-aaaa-80da344efa6a'
 
         with self.assertRaises(Deposit.DoesNotExist):
             deposit = Deposit.objects.get(external_id=external_id)
 
         # when
         response = self.client.post(
             reverse(COL_IRI, args=[self.username]),
             content_type='application/atom+xml;type=entry',
             data=self.atom_entry_data1,
             HTTP_IN_PROGRESS='True',
             HTTP_SLUG=external_id)
 
         # then
         self.assertEqual(response.status_code, status.HTTP_201_CREATED)
 
         response_content = parse_xml(BytesIO(response.content))
         deposit_id = response_content[
             '{http://www.w3.org/2005/Atom}deposit_id']
 
         deposit = Deposit.objects.get(pk=deposit_id)
         self.assertEqual(deposit.collection, self.collection)
         self.assertEqual(deposit.external_id, external_id)
         self.assertEqual(deposit.status, 'partial')
         self.assertEqual(deposit.client, self.user)
 
         # one associated request to a deposit
         deposit_requests = DepositRequest.objects.filter(deposit=deposit)
         self.assertEqual(len(deposit_requests), 1)
 
         atom_entry_data = self.atom_entry_data2 % external_id.encode('utf-8')
 
         update_uri = response._headers['location'][1]
 
         # when updating the first deposit post
         response = self.client.post(
             update_uri,
             content_type='application/atom+xml;type=entry',
             data=atom_entry_data,
             HTTP_IN_PROGRESS='False',
             HTTP_SLUG=external_id)
 
         # then
         self.assertEqual(response.status_code, status.HTTP_201_CREATED)
 
         response_content = parse_xml(BytesIO(response.content))
         deposit_id = response_content[
             '{http://www.w3.org/2005/Atom}deposit_id']
 
         deposit = Deposit.objects.get(pk=deposit_id)
         self.assertEqual(deposit.collection, self.collection)
         self.assertEqual(deposit.external_id, external_id)
         self.assertEqual(deposit.status, 'ready')
         self.assertEqual(deposit.client, self.user)
 
         self.assertEqual(len(Deposit.objects.all()), 1)
 
         # now 2 associated requests to a same deposit
         deposit_requests = DepositRequest.objects.filter(deposit=deposit)
         self.assertEqual(len(deposit_requests), 2)
 
         for deposit_request in deposit_requests:
             actual_metadata = deposit_request.metadata
             self.assertIsNotNone(actual_metadata)
             self.assertFalse(bool(deposit_request.archive))