diff --git a/livesupport/modules/storage/src/TestStorageClient.cxx b/livesupport/modules/storage/src/TestStorageClient.cxx
index 621eedd23..34a226183 100644
--- a/livesupport/modules/storage/src/TestStorageClient.cxx
+++ b/livesupport/modules/storage/src/TestStorageClient.cxx
@@ -22,7 +22,7 @@
  
  
     Author   : $Author: fgerlits $
-    Version  : $Revision: 1.23 $
+    Version  : $Revision: 1.24 $
     Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storage/src/TestStorageClient.cxx,v $
 
 ------------------------------------------------------------------------------*/
@@ -494,6 +494,10 @@ TestStorageClient :: storeAudioClip(Ptr<SessionId>::Ref sessionId,
                                     Ptr<AudioClip>::Ref audioClip)
                                                 throw (StorageException)
 {
+    if (!audioClip->getId()) {
+        audioClip->setId(UniqueId::generateId());
+    }
+
     audioClipMap[audioClip->getId()->getId()] = audioClip;
     return true;
 }
diff --git a/livesupport/modules/storage/src/TestStorageClientTest.cxx b/livesupport/modules/storage/src/TestStorageClientTest.cxx
index 5de1eeb75..eb1ff9065 100644
--- a/livesupport/modules/storage/src/TestStorageClientTest.cxx
+++ b/livesupport/modules/storage/src/TestStorageClientTest.cxx
@@ -22,7 +22,7 @@
  
  
     Author   : $Author: fgerlits $
-    Version  : $Revision: 1.18 $
+    Version  : $Revision: 1.19 $
     Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storage/src/TestStorageClientTest.cxx,v $
 
 ------------------------------------------------------------------------------*/
@@ -208,8 +208,16 @@ TestStorageClientTest :: audioClipTest(void)
     tsc->deleteAudioClip(dummySessionId, id02);
     CPPUNIT_ASSERT(!tsc->existsAudioClip(dummySessionId, id02));
 
-    tsc->storeAudioClip(dummySessionId, (*audioClipVector)[1]);
-    CPPUNIT_ASSERT(tsc->existsAudioClip(dummySessionId, id02));    
+    Ptr<const Glib::ustring>::Ref   title(new Glib::ustring("New Title"));
+    Ptr<time_duration>::Ref         playlength(new time_duration(0,0,13,0));
+    Ptr<const std::string>::Ref     uri;
+
+    Ptr<AudioClip>::Ref     newAudioClip(new AudioClip(title, playlength, uri));
+    CPPUNIT_ASSERT(!newAudioClip->getId());
+    tsc->storeAudioClip(dummySessionId, newAudioClip);
+    Ptr<UniqueId>::Ref      newId = newAudioClip->getId();
+    CPPUNIT_ASSERT(newId);
+    CPPUNIT_ASSERT(tsc->existsAudioClip(dummySessionId, newId));    
 }