diff --git a/nimbus/vm/interpreter.nim b/nimbus/vm/nvm_interpreter.nim
similarity index 100%
rename from nimbus/vm/interpreter.nim
rename to nimbus/vm/nvm_interpreter.nim
diff --git a/nimbus/vm/nvm_state_transactions.nim b/nimbus/vm/nvm_state_transactions.nim
index c7aac1a6a..22bbb1056 100644
--- a/nimbus/vm/nvm_state_transactions.nim
+++ b/nimbus/vm/nvm_state_transactions.nim
@@ -9,7 +9,7 @@ import
   options, sets,
   eth/common, chronicles, db/accounts_cache,
   transaction,
-  vm/[nvm_computation, interpreter, nvm_state, nvm_types]
+  vm/[nvm_computation, nvm_interpreter, nvm_state, nvm_types]
 
 proc validateTransaction*(vmState: BaseVMState, tx: Transaction, sender: EthAddress, fork: Fork): bool =
   let balance = vmState.readOnlyStateDB.getBalance(sender)
diff --git a/nimbus/vm_interpreter.nim b/nimbus/vm_interpreter.nim
new file mode 100644
index 000000000..ddee3ac18
--- /dev/null
+++ b/nimbus/vm_interpreter.nim
@@ -0,0 +1,21 @@
+# Nimbus
+# Copyright (c) 2018 Status Research & Development GmbH
+# Licensed under either of
+#  * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or
+#    http://www.apache.org/licenses/LICENSE-2.0)
+#  * MIT license ([LICENSE-MIT](LICENSE-MIT) or
+#    http://opensource.org/licenses/MIT)
+# at your option. This file may not be copied, modified, or distributed except
+# according to those terms.
+
+# Wrapper for a wrapper -- lol
+
+# At the moment, this header file interface is only used for testing, so it
+# might be worth merging it into a vm_internals.nim (or so) header file.
+import
+  ./vm/nvm_interpreter as vmi
+
+export
+  vmi
+
+# End
diff --git a/tests/test_code_stream.nim b/tests/test_code_stream.nim
index f78327697..aeb1e572a 100644
--- a/tests/test_code_stream.nim
+++ b/tests/test_code_stream.nim
@@ -6,7 +6,7 @@
 # at your option. This file may not be copied, modified, or distributed except according to those terms.
 
 import  unittest2, sequtils,
-        ../nimbus/vm/interpreter
+        ../nimbus/vm_interpreter
 
 proc codeStreamMain*() =
   suite "parse bytecode":
diff --git a/tests/test_gas_meter.nim b/tests/test_gas_meter.nim
index 4afe83779..4a176bc11 100644
--- a/tests/test_gas_meter.nim
+++ b/tests/test_gas_meter.nim
@@ -8,7 +8,7 @@
 import
   unittest2, macros, strformat,
   eth/common/eth_types,
-  ../nimbus/[vm_types, errors, vm/interpreter]
+  ../nimbus/[vm_types, errors, vm_interpreter]
 
 # TODO: quicktest
 # PS: parametrize can be easily immitated, but still quicktests would be even more useful
diff --git a/tests/test_generalstate_json.nim b/tests/test_generalstate_json.nim
index f58513943..ca7b7f8f8 100644
--- a/tests/test_generalstate_json.nim
+++ b/tests/test_generalstate_json.nim
@@ -13,7 +13,7 @@ import
   ../nimbus/p2p/executor, test_config,
   ../nimbus/transaction,
   ../nimbus/[vm_state, vm_types, utils],
-  ../nimbus/vm/interpreter,
+  ../nimbus/vm_interpreter,
   ../nimbus/db/[db_chain, accounts_cache]
 
 type
diff --git a/tests/test_stack.nim b/tests/test_stack.nim
index a1027226b..014ecf434 100644
--- a/tests/test_stack.nim
+++ b/tests/test_stack.nim
@@ -8,7 +8,7 @@
 import
   unittest2,
   eth/common/eth_types,
-  ../nimbus/[constants, errors, vm/interpreter]
+  ../nimbus/[constants, errors, vm_interpreter]
 
 
 template testPush(value: untyped, expected: untyped): untyped =
diff --git a/tests/test_vm_json.nim b/tests/test_vm_json.nim
index d46779587..0925748a2 100644
--- a/tests/test_vm_json.nim
+++ b/tests/test_vm_json.nim
@@ -8,7 +8,7 @@
 import
   unittest2, strformat, strutils, tables, json, os, times, sequtils,
   stew/byteutils, eth/[rlp, common], eth/trie/db,
-  ./test_helpers, ./test_allowed_to_fail, ../nimbus/vm/interpreter,
+  ./test_helpers, ./test_allowed_to_fail, ../nimbus/vm_interpreter,
   ../nimbus/[constants, vm_state, vm_types, utils],
   ../nimbus/db/[db_chain]