diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 31f15c306..207481b11 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -379,6 +379,7 @@ darwin:
       export PLATFORM=x86_64-apple-darwin
       cargo build -j 8 --features final --release #$CARGOFLAGS
       cargo build -j 8 --features final --release -p ethstore #$CARGOFLAGS
+      cargo build -j 8 --features final --release -p evmbin #$CARGOFLAGS
       rm -rf parity.md5
       md5sum target/release/parity > parity.md5
       export SHA3=$(target/release/parity tools hash target/release/parity)
@@ -504,7 +505,7 @@ test-windows:
     - git submodule update --init --recursive
   script:
     - set RUST_BACKTRACE=1
-    - echo cargo test --features json-tests -p rlp -p ethash -p ethcore -p ethcore-bigint -p ethcore-dapps -p ethcore-rpc -p ethcore-signer -p ethcore-util -p ethcore-network -p ethcore-io -p ethkey -p ethstore -p ethsync -p ethcore-ipc -p ethcore-ipc-tests -p ethcore-ipc-nano -p parity %CARGOFLAGS% --verbose --release
+    - echo cargo test --features json-tests -p rlp -p ethash -p ethcore -p ethcore-bigint -p ethcore-dapps -p ethcore-rpc -p ethcore-signer -p ethcore-util -p ethcore-network -p ethcore-io -p ethkey -p ethstore -p evmbin -p ethsync -p ethcore-ipc -p ethcore-ipc-tests -p ethcore-ipc-nano -p parity %CARGOFLAGS% --verbose --release
   tags:
     - rust-windows
   allow_failure: true
diff --git a/Cargo.lock b/Cargo.lock
index 3da15278e..90ef54f8f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -24,6 +24,7 @@ dependencies = [
  "ethcore-stratum 1.6.0",
  "ethcore-util 1.6.0",
  "ethsync 1.6.0",
+ "evmbin 0.1.0",
  "fdlimit 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "hyper 0.10.0-a.0 (git+https://github.com/ethcore/hyper)",
  "isatty 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -781,6 +782,16 @@ dependencies = [
  "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "evmbin"
+version = "0.1.0"
+dependencies = [
+ "docopt 0.6.80 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ethcore 1.6.0",
+ "ethcore-util 1.6.0",
+ "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "evmjit"
 version = "1.6.0"
diff --git a/Cargo.toml b/Cargo.toml
index 4dac6a221..e44852c74 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -39,6 +39,7 @@ ethcore-ipc-hypervisor = { path = "ipc/hypervisor" }
 ethcore-light = { path = "ethcore/light" }
 ethcore-logger = { path = "logger" }
 ethcore-stratum = { path = "stratum" }
+evmbin = { path = "evmbin" }
 rlp = { path = "util/rlp" }
 rpc-cli = { path = "rpc_cli" }
 parity-rpc-client = { path = "rpc_client" }
diff --git a/evmbin/Cargo.toml b/evmbin/Cargo.toml
index ad2d69d57..98193a5c3 100644
--- a/evmbin/Cargo.toml
+++ b/evmbin/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "evm"
+name = "evmbin"
 description = "Parity's EVM implementation"
 version = "0.1.0"
 authors = ["Parity Technologies <admin@parity.io>"]
diff --git a/evmbin/src/ext.rs b/evmbin/src/ext.rs
index 1b5f17c05..6492f4fdc 100644
--- a/evmbin/src/ext.rs
+++ b/evmbin/src/ext.rs
@@ -31,7 +31,7 @@ pub struct FakeExt {
 impl Default for FakeExt {
 	fn default() -> Self {
 		FakeExt {
-			schedule: Schedule::new_homestead_gas_fix(),
+			schedule: Schedule::new_post_eip150(usize::max_value(), true, true, true),
 			store: HashMap::new(),
 			depth: 1,
 		}
@@ -51,8 +51,8 @@ impl Ext for FakeExt {
 		unimplemented!();
 	}
 
-	fn exists_and_not_null(&self, address: &Address) -> bool {
-		unimplemented!(); 
+	fn exists_and_not_null(&self, _address: &Address) -> bool {
+		unimplemented!();
 	}
 
 	fn origin_balance(&self) -> U256 {
diff --git a/evmbin/src/main.rs b/evmbin/src/main.rs
index 5ba4e5950..6fbe5a280 100644
--- a/evmbin/src/main.rs
+++ b/evmbin/src/main.rs
@@ -21,7 +21,6 @@
 extern crate ethcore;
 extern crate rustc_serialize;
 extern crate docopt;
-#[macro_use]
 extern crate ethcore_util as util;
 
 mod ext;