diff --git a/libs/ardour/test/test_needing_session.cc b/libs/ardour/test/test_needing_session.cc
index 625d5735b2..70e3362f33 100644
--- a/libs/ardour/test/test_needing_session.cc
+++ b/libs/ardour/test/test_needing_session.cc
@@ -6,8 +6,6 @@
 #include "ardour/audioengine.h"
 #include "test_needing_session.h"
 
-extern void setup_libpbd_enums ();
-
 using namespace std;
 using namespace ARDOUR;
 using namespace PBD;
@@ -56,11 +54,8 @@ TestNeedingSession::setUp ()
 	string const test_session_path = "libs/ardour/test/test_session";
 	system (string_compose ("rm -rf %1", test_session_path).c_str());
 	
-	init (false, true);
 	SessionEvent::create_per_thread_pool ("test", 512);
 
-	setup_libpbd_enums ();
-
 	test_receiver.listen_to (error);
 	test_receiver.listen_to (info);
 	test_receiver.listen_to (fatal);
@@ -83,7 +78,6 @@ TestNeedingSession::tearDown ()
 	
 	delete _session;
 
-	EnumWriter::destroy ();
 	MIDI::Manager::destroy ();
 	AudioEngine::destroy ();
 }