diff --git a/akonadi/tests/cachetest.cpp b/akonadi/tests/cachetest.cpp
index da098d144..50a89ed85 100644
--- a/akonadi/tests/cachetest.cpp
+++ b/akonadi/tests/cachetest.cpp
@@ -1,140 +1,139 @@
 /*
     Copyright (c) 2009 Volker Krause <vkrause@kde.org>
 
     This library is free software; you can redistribute it and/or modify it
     under the terms of the GNU Library General Public License as published by
     the Free Software Foundation; either version 2 of the License, or (at your
     option) any later version.
 
     This library is distributed in the hope that it will be useful, but WITHOUT
     ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
     FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
     License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to the
     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
     02110-1301, USA.
 */
 
 #include "test_utils.h"
 
 #include "collection.h"
 #include "collectionfetchjob.h"
 #include "collectionmodifyjob.h"
 #include "item.h"
 #include "itemfetchjob.h"
 #include "itemfetchscope.h"
 #include "agentmanager.h"
 #include "agentinstance.h"
 #include "itemcopyjob.h"
 
 #include <QHash>
 
 using namespace Akonadi;
 
 class CacheTest : public QObject
 {
   Q_OBJECT
   private:
     void enableAgent( const QString &id, bool enable )
     {
       foreach ( AgentInstance agent, Akonadi::AgentManager::self()->instances() )
         if ( agent.identifier() == id )
           agent.setIsOnline( enable );
     }
 
   private slots:
     void testResourceRetrievalOnFetch_data()
     {
       QTest::addColumn<Item>( "item" );
       QTest::addColumn<bool>( "resourceEnabled" );
 
       QTest::newRow( "resource online" ) << Item( 1 ) << true;
       QTest::newRow( "resource offline" ) << Item( 2 ) << false;
     }
 
     void testResourceRetrievalOnFetch()
     {
       QFETCH( Item, item );
       QFETCH( bool, resourceEnabled );
 
       ItemFetchJob *fetch = new ItemFetchJob( item, this );
       fetch->fetchScope().fetchFullPayload();
       fetch->fetchScope().setCacheOnly( true );
       QVERIFY( fetch->exec() );
       QCOMPARE( fetch->items().count(), 1 );
       item = fetch->items().first();
       QVERIFY( item.isValid() );
       QVERIFY( !item.hasPayload() );
 
       enableAgent( "akonadi_knut_resource_0", resourceEnabled );
 
       fetch = new ItemFetchJob( item, this );
       fetch->fetchScope().fetchFullPayload();
       QEXPECT_FAIL( "resource offline", "what do we actually want here?", Continue );
       QCOMPARE( fetch->exec(), resourceEnabled );
       if ( resourceEnabled ) {
         QCOMPARE( fetch->items().count(), 1 );
         item = fetch->items().first();
         QVERIFY( item.isValid() );
         QVERIFY( item.hasPayload() );
       }
 
       fetch = new ItemFetchJob( item, this );
       fetch->fetchScope().fetchFullPayload();
       fetch->fetchScope().setCacheOnly( true );
       QVERIFY( fetch->exec() );
       QCOMPARE( fetch->items().count(), 1 );
       item = fetch->items().first();
       QVERIFY( item.isValid() );
       QCOMPARE( item.hasPayload(), resourceEnabled );
     }
 
     void testResourceRetrievalOnCopy_data()
     {
       QTest::addColumn<Item>( "item" );
       QTest::addColumn<bool>( "resourceEnabled" );
 
       QTest::newRow( "online" ) << Item( 3 ) << true;
       QTest::newRow( "offline" ) << Item( 4 ) << false;
     }
 
     void testResourceRetrievalOnCopy()
     {
       QFETCH( Item, item );
       QFETCH( bool, resourceEnabled );
 
       ItemFetchJob *fetch = new ItemFetchJob( item, this );
       fetch->fetchScope().fetchFullPayload();
       fetch->fetchScope().setCacheOnly( true );
       QVERIFY( fetch->exec() );
       QCOMPARE( fetch->items().count(), 1 );
       item = fetch->items().first();
       QVERIFY( item.isValid() );
       QVERIFY( !item.hasPayload() );
 
       enableAgent( "akonadi_knut_resource_0", resourceEnabled );
 
       Collection dest( collectionIdFromPath( "res3" ) );
       QVERIFY( dest.isValid() );
 
       ItemCopyJob *copy = new ItemCopyJob( item, dest, this );
-      QEXPECT_FAIL( "offline", "server bug", Continue );
       QCOMPARE( copy->exec(), resourceEnabled );
 
       fetch = new ItemFetchJob( item, this );
       fetch->fetchScope().fetchFullPayload();
       fetch->fetchScope().setCacheOnly( true );
       QVERIFY( fetch->exec() );
       QCOMPARE( fetch->items().count(), 1 );
       item = fetch->items().first();
       QVERIFY( item.isValid() );
       QCOMPARE( item.hasPayload(), resourceEnabled );
     }
 
 };
 
 QTEST_AKONADIMAIN( CacheTest, NoGUI )
 
 #include "cachetest.moc"