--- a/kerneltest/e32test/cppexceptions/t_unmap.cpp	Mon Oct 18 15:31:10 2010 +0100
+++ b/kerneltest/e32test/cppexceptions/t_unmap.cpp	Wed Oct 20 13:58:28 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of the License "Eclipse Public License v1.0"
@@ -140,12 +140,8 @@
 
 TInt E32Main()
    	{
-	// Turn off lazy dll unloading
-	RLoader l;
-	test(l.Connect()==KErrNone);
-	test(l.CancelLazyDllUnload()==KErrNone);
-	l.Close();
-	
+	COMPLETE_POST_BOOT_SYSTEM_TASKS();
+
 	test.Start(_L("Check code seg unmapping over User::Leave()/C++ exceptions."));
 
 	__UHEAP_MARK;