diff --git a/createRandomTest.cpp b/createRandomTest.cpp
index caeeb6b67..a11688457 100644
--- a/createRandomTest.cpp
+++ b/createRandomTest.cpp
@@ -32,7 +32,7 @@
 #include <libdevcore/CommonIO.h>
 #include <libdevcore/CommonData.h>
 #include <libevmcore/Instruction.h>
-#include <libevm/VM.h>
+#include <libevm/VMFactory.h>
 #include "vm.h"
 
 using namespace std;
@@ -142,14 +142,14 @@ void doMyTests(json_spirit::mValue& v)
 		}
 
 		bytes output;
-		eth::VM vm(fev.gas);
+		auto vm = eth::VMFactory::create(fev.gas);
 
 		u256 gas;
 		bool vmExceptionOccured = false;
 		try
 		{
-			output = vm.go(fev, fev.simpleTrace()).toBytes();
-			gas = vm.gas();
+			output = vm->go(fev, fev.simpleTrace()).toBytes();
+			gas = vm->gas();
 		}
 		catch (eth::VMException const& _e)
 		{
diff --git a/vm.cpp b/vm.cpp
index 45034b716..02cee0a05 100644
--- a/vm.cpp
+++ b/vm.cpp
@@ -22,6 +22,7 @@
 
 #include <boost/filesystem.hpp>
 #include <libethereum/Executive.h>
+#include <libevm/VMFactory.h>
 #include "vm.h"
 
 using namespace std;
@@ -298,14 +299,14 @@ void doVMTests(json_spirit::mValue& v, bool _fillin)
 		}
 
 		bytes output;
-		VM vm(fev.gas);
+		auto vm = eth::VMFactory::create(fev.gas);
 
 		u256 gas;
 		bool vmExceptionOccured = false;
 		try
 		{
-			output = vm.go(fev, fev.simpleTrace()).toBytes();
-			gas = vm.gas();
+			output = vm->go(fev, fev.simpleTrace()).toBytes();
+			gas = vm->gas();
 		}
 		catch (VMException const& _e)
 		{