diff --git a/polkadot/Cargo.lock b/polkadot/Cargo.lock
index d5067bb431..39e83d668b 100644
--- a/polkadot/Cargo.lock
+++ b/polkadot/Cargo.lock
@@ -4487,19 +4487,6 @@ dependencies = [
  "memoffset",
 ]
 
-[[package]]
-name = "node-primitives"
-version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#529c2fd27d3d584951f73ba05bdea357117eadec"
-dependencies = [
- "frame-system",
- "parity-scale-codec",
- "scale-info",
- "sp-application-crypto",
- "sp-core",
- "sp-runtime",
-]
-
 [[package]]
 name = "nodrop"
 version = "0.1.14"
@@ -5969,9 +5956,9 @@ dependencies = [
  "assert_cmd",
  "color-eyre",
  "nix",
- "node-primitives",
  "parity-util-mem",
  "polkadot-cli",
+ "polkadot-core-primitives",
  "remote-externalities",
  "tempfile",
  "tokio",
diff --git a/polkadot/Cargo.toml b/polkadot/Cargo.toml
index 5e273ac3ae..dacbeb230c 100644
--- a/polkadot/Cargo.toml
+++ b/polkadot/Cargo.toml
@@ -23,7 +23,7 @@ nix = "0.23.1"
 tempfile = "3.2.0"
 tokio = "1.15.0"
 remote-externalities = { git = "https://github.com/paritytech/substrate", branch = "master" }
-node-primitives = { git = "https://github.com/paritytech/substrate", branch = "master" }
+polkadot-core-primitives = { path = "core-primitives" }
 
 [workspace]
 members = [
diff --git a/polkadot/tests/common.rs b/polkadot/tests/common.rs
index 4d5b19d229..0007bdc220 100644
--- a/polkadot/tests/common.rs
+++ b/polkadot/tests/common.rs
@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
 
-use node_primitives::Block;
+use polkadot_core_primitives::Block;
 use remote_externalities::rpc_api::get_finalized_head;
 use std::{
 	process::{Child, ExitStatus},
@@ -25,7 +25,7 @@ use tokio::time::timeout;
 
 static LOCALHOST_WS: &str = "ws://127.0.0.1:9944/";
 
-/// Wait for the given `child` the given ammount of `secs`.
+/// Wait for the given `child` the given amount of `secs`.
 ///
 /// Returns the `Some(exit status)` or `None` if the process did not finish in the given time.
 pub fn wait_for(child: &mut Child, secs: usize) -> Option<ExitStatus> {