diff --git a/colab/proxy/trac/migrations/0001_initial.py b/colab/proxy/trac/migrations/0001_initial.py
index b9b03cf..b27b01d 100644
--- a/colab/proxy/trac/migrations/0001_initial.py
+++ b/colab/proxy/trac/migrations/0001_initial.py
@@ -37,7 +37,7 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='Revision',
             fields=[
-                ('key', models.TextField(serialize=False, primary_key=True, blank=True)),
+                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
                 ('rev', models.TextField(blank=True)),
                 ('author', models.TextField(blank=True)),
                 ('message', models.TextField(blank=True)),
@@ -47,16 +47,15 @@ class Migration(migrations.Migration):
                 ('modified', models.DateTimeField(null=True, blank=True)),
             ],
             options={
-                'db_table': 'trac_revision',
-                'verbose_name': 'Attachment',
-                'verbose_name_plural': 'Attachment',
+                'verbose_name': 'Revision',
+                'verbose_name_plural': 'Revision',
             },
             bases=(models.Model, hitcounter.models.HitCounterModelMixin),
         ),
         migrations.CreateModel(
             name='Ticket',
             fields=[
-                ('id', models.IntegerField(serialize=False, primary_key=True)),
+                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
                 ('summary', models.TextField(blank=True)),
                 ('description_ticket', models.TextField(blank=True)),
                 ('milestone', models.TextField(blank=True)),
@@ -75,24 +74,12 @@ class Migration(migrations.Migration):
                 ('modified_by', models.TextField(blank=True)),
             ],
             options={
-                'verbose_name': 'Attachment',
-                'verbose_name_plural': 'Attachment',
+                'verbose_name': 'Ticket',
+                'verbose_name_plural': 'Ticket',
             },
             bases=(models.Model, hitcounter.models.HitCounterModelMixin),
         ),
         migrations.CreateModel(
-            name='TicketCollabCount',
-            fields=[
-                ('author', models.TextField(serialize=False, primary_key=True)),
-                ('count', models.IntegerField()),
-            ],
-            options={
-                'verbose_name': 'Attachment',
-                'verbose_name_plural': 'Attachment',
-            },
-            bases=(models.Model,),
-        ),
-        migrations.CreateModel(
             name='Wiki',
             fields=[
                 ('title', models.TextField(serialize=False, primary_key=True)),
@@ -104,21 +91,9 @@ class Migration(migrations.Migration):
                 ('user', models.ForeignKey(on_delete=django.db.models.deletion.SET_NULL, to=settings.AUTH_USER_MODEL, null=True)),
             ],
             options={
-                'verbose_name': 'Attachment',
-                'verbose_name_plural': 'Attachment',
+                'verbose_name': 'Wiki',
+                'verbose_name_plural': 'Wiki',
             },
             bases=(models.Model, hitcounter.models.HitCounterModelMixin),
         ),
-        migrations.CreateModel(
-            name='WikiCollabCount',
-            fields=[
-                ('author', models.TextField(serialize=False, primary_key=True)),
-                ('count', models.IntegerField()),
-            ],
-            options={
-                'verbose_name': 'Attachment',
-                'verbose_name_plural': 'Attachment',
-            },
-            bases=(models.Model,),
-        ),
     ]
diff --git a/colab/proxy/trac/models.py b/colab/proxy/trac/models.py
index a605cec..993aa08 100644
--- a/colab/proxy/trac/models.py
+++ b/colab/proxy/trac/models.py
@@ -52,7 +52,6 @@ class Attachment(models.Model, HitCounterModelMixin):
 class Revision(models.Model, HitCounterModelMixin):
     update_field = 'created'
     icon_name = 'align-right'
-    key = models.TextField(blank=True, primary_key=True)
     rev = models.TextField(blank=True)
     author = models.TextField(blank=True)
     message = models.TextField(blank=True)
@@ -66,9 +65,8 @@ class Revision(models.Model, HitCounterModelMixin):
         return u'{} [{}]'.format(self.repository_name, self.rev)
 
     class Meta:
-        verbose_name = _('Attachment')
-        verbose_name_plural = _('Attachment')
-        db_table = 'trac_revision'        
+        verbose_name = _('Revision')
+        verbose_name_plural = _('Revision')
 
     def get_absolute_url(self):
         return u'/changeset/{}/{}'.format(self.rev, self.repository_name)
@@ -83,7 +81,6 @@ class Revision(models.Model, HitCounterModelMixin):
 class Ticket(models.Model, HitCounterModelMixin):
     icon_name = 'tag'
     type = 'ticket'
-    id = models.IntegerField(primary_key=True)
     summary = models.TextField(blank=True)
     description_ticket = models.TextField(blank=True)
     milestone = models.TextField(blank=True)
@@ -113,8 +110,8 @@ class Ticket(models.Model, HitCounterModelMixin):
         )
 
     class Meta:
-        verbose_name = _('Attachment')
-        verbose_name_plural = _('Attachment')
+        verbose_name = _('Ticket')
+        verbose_name_plural = _('Ticket')
 
     def get_absolute_url(self):
         return u'/ticket/{}'.format(self.id)
@@ -147,8 +144,8 @@ class Wiki(Collaboration, HitCounterModelMixin):
         return u'{}\n{}'.format(self.wiki_text, self.collaborators)
 
     class Meta:
-        verbose_name = _('Attachment')
-        verbose_name_plural = _('Attachment')
+        verbose_name = _('Wiki')
+        verbose_name_plural = _('Wiki')
 
     def get_absolute_url(self):
         return u'/wiki/{}'.format(self.title)
@@ -165,20 +162,3 @@ class Wiki(Collaboration, HitCounterModelMixin):
         except User.DoesNotExist:
             return None
 
-
-class WikiCollabCount(models.Model):
-    author = models.TextField(primary_key=True)
-    count = models.IntegerField()
-
-    class Meta:
-        verbose_name = _('Attachment')
-        verbose_name_plural = _('Attachment')
-
-
-class TicketCollabCount(models.Model):
-    author = models.TextField(primary_key=True)
-    count = models.IntegerField()
-
-    class Meta:
-        verbose_name = _('Attachment')
-        verbose_name_plural = _('Attachment')
diff --git a/colab/proxy/trac/tests/test_trac.py b/colab/proxy/trac/tests/test_trac.py
index 6366bec..dc1ddd2 100644
--- a/colab/proxy/trac/tests/test_trac.py
+++ b/colab/proxy/trac/tests/test_trac.py
@@ -162,8 +162,6 @@ class WikiTest(TestCase):
         wiki.collaborators = 'collaborators'
         wiki.created = '1994-11-05T08:15:30-05:00'
         wiki.modified = '1994-11-05T08:15:30-05:00'
-        from django.conf import settings
-        print settings.INSTALLED_APPS
         wiki.save()
 
         return wiki
diff --git a/tests/run.py b/tests/run.py
index b2366bb..691a7fc 100755
--- a/tests/run.py
+++ b/tests/run.py
@@ -6,7 +6,7 @@ import sys
 os.environ['DJANGO_SETTINGS_MODULE'] = 'tests.settings'
 os.environ['COLAB_SETTINGS'] = 'tests/settings.yaml'
 os.environ['COVERAGE_PROCESS_START'] = '.coveragerc'
-os.environ['REUSE_DB'] = '0'
+os.environ['REUSE_DB'] = '1'
 
 import django
 import coverage
@@ -14,7 +14,6 @@ import coverage
 from django.test.utils import get_runner
 from django.conf import settings
 
-
 def runtests():
     if django.VERSION >= (1, 7, 0):
         django.setup()
diff --git a/tests/settings.yaml b/tests/settings.yaml
index eb22694..7032864 100644
--- a/tests/settings.yaml
+++ b/tests/settings.yaml
@@ -64,10 +64,10 @@ ROBOTS_NOINDEX: false
 
 ### Colab proxied apps
 PROXIED_APPS:
-  gitlab:
-    upstream: 'http://localhost:8090/gitlab/'
-    private_token: ''
-#   trac:
-#     upstream: 'http://localhost:5000/trac/'
+#   gitlab:
+#     upstream: 'http://localhost:8090/gitlab/'
+#     private_token: ''
+  trac:
+    upstream: 'http://localhost:5000/trac/'
 
 
--
libgit2 0.21.2