diff --git a/pubs/endecoder.py b/pubs/endecoder.py
index 219919e..d7f450d 100644
--- a/pubs/endecoder.py
+++ b/pubs/endecoder.py
@@ -100,6 +100,9 @@ class EnDecoder(object):
     def _decode_bibdata(self, bibdata_stream):
         try:
             entries = bp.bparser.BibTexParser(bibdata_stream, customization=customizations).get_entry_dict()
+            # Remove 'id' attribute which is stored as citekey
+            for e in entries:
+                entries[e].pop('id')
             if len(entries) > 0:
                 return entries
         except Exception:
diff --git a/pubs/paper.py b/pubs/paper.py
index 3c91d30..1b0a8ba 100644
--- a/pubs/paper.py
+++ b/pubs/paper.py
@@ -24,8 +24,6 @@ class Paper(object):
         self.bibdata  = bibdata
 
         _, self.bibentry = bibstruct.get_entry(self.bibdata)
-        if 'id' in self.bibentry:
-            self.bibentry.pop('id')
 
         if self.metadata is None:
             self.metadata = copy.deepcopy(DEFAULT_META)
diff --git a/tests/test_repo.py b/tests/test_repo.py
index 7dcacfc..296ea07 100644
--- a/tests/test_repo.py
+++ b/tests/test_repo.py
@@ -43,7 +43,6 @@ class TestPushPaper(TestRepo):
         orig = fixtures.doe_bibdata
         self.repo.push_paper(Paper(orig))
         retrieved = self.repo.databroker.pull_bibdata('Doe2013')
-        retrieved['Doe2013'].pop('id')
         self.assertEquals(orig, retrieved)
 
     def test_pushes_paper_metadata(self):
diff --git a/tests/test_usecase.py b/tests/test_usecase.py
index 4883132..fb75782 100644
--- a/tests/test_usecase.py
+++ b/tests/test_usecase.py
@@ -46,6 +46,8 @@ class TestFakeInput(unittest.TestCase):
 class CommandTestCase(unittest.TestCase):
     """Abstract TestCase intializing the fake filesystem."""
 
+    maxDiff = None
+
     def setUp(self):
         self.fs = fake_env.create_fake_fs([content, filebroker, init_cmd, import_cmd])