diff --git a/djsixpack/__init__.py b/djsixpack/__init__.py
index e4bdfb1..a5e9bd2 100644
--- a/djsixpack/__init__.py
+++ b/djsixpack/__init__.py
@@ -1 +1 @@
-__version__ = "1.1.2-wave"
+__version__ = "1.1.3-wave"
diff --git a/djsixpack/djsixpack.py b/djsixpack/djsixpack.py
index 478f496..f1e1cdf 100644
--- a/djsixpack/djsixpack.py
+++ b/djsixpack/djsixpack.py
@@ -75,6 +75,12 @@ def get_participant_bucket(self):
             participant = SixpackParticipant.objects.get(unique_attr=self.client_id, experiment_name=self._get_experiment_name())
         except SixpackParticipant.DoesNotExist:
             return None
+        except SixpackParticipant.MultipleObjectsReturned:
+            # clean up duplicate entries
+            duplicates = SixpackParticipant.objects.filter(unique_attr=self.client_id, experiment_name=self._get_experiment_name())
+            for dup in duplicates[1:]:
+                dup.delete()
+            return duplicates[0].bucket
         return participant.bucket
 
     def participate(self, force=None, user_agent=None, ip_address=None, prefetch=False, bucket=None):
diff --git a/djsixpack/tests/class_tests.py b/djsixpack/tests/class_tests.py
index 59999e1..9218989 100644
--- a/djsixpack/tests/class_tests.py
+++ b/djsixpack/tests/class_tests.py
@@ -3,6 +3,8 @@
 from django.test import TestCase
 
 from djsixpack.djsixpack import SixpackTest
+from djsixpack.models import SixpackParticipant
+from djsixpack.tests.factories import SixpackParticipantFactory
 
 
 class ClientIdTest(TestCase):
@@ -158,7 +160,7 @@ class DefaultTest(SixpackTest):
         )
         self.assertEqual(
             sp_mock.Session.return_value.participate.call_args_list,
-            [call('default', ('FIRST', 'SECOND'), force=None, prefetch=False)]
+            [call('default', ('FIRST', 'SECOND'), force=None, bucket=None, prefetch=False)]
         )
 
         class ConvertTest(TestCase):
@@ -217,3 +219,45 @@ class AltTest(SixpackTest):
 
         self.assertTrue(hasattr(AltTest, 'FIRST'))
         self.assertTrue(hasattr(AltTest, 'SECOND'))
+
+
+class GetParticipantBucketTest(TestCase):
+
+    def test_get_bucket__single_record(self):
+        mock_user = Mock(pk=10)
+
+        class GetBucketTest(SixpackTest):
+            alternatives = ('FIRST', 'SECOND')
+
+        expt = GetBucketTest(mock_user)
+        expt.local = True
+        expt.participate(bucket='FIRST')
+
+        self.assertEquals(expt.get_participant_bucket(), 'FIRST')
+
+    def test_get_bucket__zero_records(self):
+        mock_user = Mock(pk=10)
+
+        class GetBucketTest(SixpackTest):
+            alternatives = ('FIRST', 'SECOND')
+
+        expt = GetBucketTest(mock_user)
+        self.assertIsNone(expt.get_participant_bucket())
+
+    def test_get_bucket__multiple_records(self):
+        mock_user = Mock(pk=10)
+
+        class GetBucketTest(SixpackTest):
+            alternatives = ('FIRST', 'SECOND')
+
+        expt = GetBucketTest(mock_user)
+        expt.local = True
+        expt.participate(bucket='FIRST')
+
+        # Insert an extra record to mess things up.
+        SixpackParticipantFactory(experiment_name='get_bucket', unique_attr=10, bucket='SECOND')
+
+        self.assertEquals(expt.get_participant_bucket(), 'FIRST')
+
+        record_count = SixpackParticipant.objects.filter(experiment_name='get_bucket', unique_attr=10).count()
+        self.assertEquals(record_count, 1)
diff --git a/djsixpack/tests/factories.py b/djsixpack/tests/factories.py
new file mode 100644
index 0000000..8271f74
--- /dev/null
+++ b/djsixpack/tests/factories.py
@@ -0,0 +1,12 @@
+from factory import Factory
+
+from djsixpack.models import SixpackParticipant
+
+
+class SixpackParticipantFactory(Factory):
+
+    FACTORY_FOR = SixpackParticipant
+
+    experiment_name = 'Science Experiment'
+    unique_attr = 1
+    bucket = 'Bucket A'
diff --git a/requirements.txt b/requirements.txt
new file mode 100644
index 0000000..1fd4d95
--- /dev/null
+++ b/requirements.txt
@@ -0,0 +1 @@
+factory-boy==1.1.3
\ No newline at end of file