diff --git a/tests/fixtures/simple_dep/a/build.yaml b/tests/fixtures/simple_dep/a/build.yaml
new file mode 100644
index 00000000..08a10e6c
--- /dev/null
+++ b/tests/fixtures/simple_dep/a/build.yaml
@@ -0,0 +1,5 @@
+image: "alpine"
+prelude:
+  - echo a > /a-prelude
+steps:
+  - echo a > /a
diff --git a/tests/fixtures/simple_dep/a/definition.yaml b/tests/fixtures/simple_dep/a/definition.yaml
new file mode 100644
index 00000000..006dd943
--- /dev/null
+++ b/tests/fixtures/simple_dep/a/definition.yaml
@@ -0,0 +1,3 @@
+category: "test"
+name: "a"
+version: "1.2"
diff --git a/tests/fixtures/simple_dep/b/build.yaml b/tests/fixtures/simple_dep/b/build.yaml
new file mode 100644
index 00000000..4448feb4
--- /dev/null
+++ b/tests/fixtures/simple_dep/b/build.yaml
@@ -0,0 +1,9 @@
+requires:
+- category: "test"
+  name: "a"
+  version: ">=0"
+
+prelude:
+  - echo b > /b-prelude
+steps:
+  - echo b > /b
diff --git a/tests/fixtures/simple_dep/b/definition.yaml b/tests/fixtures/simple_dep/b/definition.yaml
new file mode 100644
index 00000000..e695c6c9
--- /dev/null
+++ b/tests/fixtures/simple_dep/b/definition.yaml
@@ -0,0 +1,3 @@
+category: "test"
+name: "b"
+version: "1.1"
diff --git a/tests/fixtures/simple_dep/c/build.yaml b/tests/fixtures/simple_dep/c/build.yaml
new file mode 100644
index 00000000..93c10e85
--- /dev/null
+++ b/tests/fixtures/simple_dep/c/build.yaml
@@ -0,0 +1,7 @@
+requires:
+- category: "test"
+  name: "a"
+  version: ">=0"
+steps:
+  - echo c > /c
+
diff --git a/tests/fixtures/simple_dep/c/definition.yaml b/tests/fixtures/simple_dep/c/definition.yaml
new file mode 100644
index 00000000..e63d83a3
--- /dev/null
+++ b/tests/fixtures/simple_dep/c/definition.yaml
@@ -0,0 +1,9 @@
+category: "test"
+name: "c"
+version: "1.0"
+# Boom?
+
+requires:
+- category: "test"
+  name: "a"
+  version: ">=0.1"
\ No newline at end of file
diff --git a/tests/integration/23_replaces.sh b/tests/integration/23_replaces.sh
new file mode 100755
index 00000000..1f419e36
--- /dev/null
+++ b/tests/integration/23_replaces.sh
@@ -0,0 +1,79 @@
+#!/bin/bash
+
+export LUET_NOLOCK=true
+
+oneTimeSetUp() {
+export tmpdir="$(mktemp -d)"
+}
+
+oneTimeTearDown() {
+    rm -rf "$tmpdir"
+}
+
+testBuild() {
+    mkdir $tmpdir/testbuild
+    luet build --tree "$ROOT_DIR/tests/fixtures/simple_dep" --destination $tmpdir/testbuild test/b
+    luet build --tree "$ROOT_DIR/tests/fixtures/simple_dep" --destination $tmpdir/testbuild test/a
+    luet build --tree "$ROOT_DIR/tests/fixtures/simple_dep" --destination $tmpdir/testbuild test/c
+    assertTrue 'create package B 1.1' "[ -e '$tmpdir/testbuild/b-test-1.1.package.tar' ]"
+    assertTrue 'create package A 1.2' "[ -e '$tmpdir/testbuild/a-test-1.2.package.tar' ]"
+    assertTrue 'create package C 1.0' "[ -e '$tmpdir/testbuild/c-test-1.0.package.tar' ]"
+}
+
+testRepo() {
+    assertTrue 'no repository' "[ ! -e '$tmpdir/testbuild/repository.yaml' ]"
+    luet create-repo --tree "$ROOT_DIR/tests/fixtures/simple_dep" \
+    --output $tmpdir/testbuild \
+    --packages $tmpdir/testbuild \
+    --name "test" \
+    --descr "Test Repo" \
+    --urls $tmpdir/testrootfs \
+    --type http
+
+    createst=$?
+    assertEquals 'create repo successfully' "$createst" "0"
+    assertTrue 'create repository' "[ -e '$tmpdir/testbuild/repository.yaml' ]"
+}
+
+testConfig() {
+    mkdir $tmpdir/testrootfs
+    cat <<EOF > $tmpdir/luet.yaml
+general:
+  debug: true
+system:
+  rootfs: $tmpdir/testrootfs
+  database_path: "/"
+  database_engine: "boltdb"
+config_from_host: true
+repositories:
+   - name: "main"
+     type: "disk"
+     enable: true
+     urls:
+       - "$tmpdir/testbuild"
+EOF
+    luet config --config $tmpdir/luet.yaml
+    res=$?
+    assertEquals 'config test successfully' "$res" "0"
+}
+
+testInstall() {
+    luet install -y --config $tmpdir/luet.yaml test/b
+    installst=$?
+    assertEquals 'install test successfully' "$installst" "0"
+    assertTrue 'package installed B' "[ -e '$tmpdir/testrootfs/b' ]"
+}
+
+testReplace() {
+    luet --config $tmpdir/luet.yaml replace -y test/b --for test/c
+    installst=$?
+    assertEquals 'replace test successfully' "$installst" "0"
+    echo "$upgrade"
+    assertTrue 'package uninstalled B' "[ ! -e '$tmpdir/testrootfs/b' ]"
+    assertTrue 'package installed C' "[ -e '$tmpdir/testrootfs/c' ]"
+    assertTrue 'package installed A' "[ -e '$tmpdir/testrootfs/a' ]"
+}
+
+# Load shUnit2.
+. "$ROOT_DIR/tests/integration/shunit2"/shunit2
+
diff --git a/tests/integration/24_buildonlytarget.sh b/tests/integration/24_buildonlytarget.sh
new file mode 100755
index 00000000..1ffe2615
--- /dev/null
+++ b/tests/integration/24_buildonlytarget.sh
@@ -0,0 +1,35 @@
+#!/bin/bash
+
+export LUET_NOLOCK=true
+
+oneTimeSetUp() {
+export tmpdir="$(mktemp -d)"
+}
+
+oneTimeTearDown() {
+    rm -rf "$tmpdir"
+}
+
+testBuild() {
+    mkdir $tmpdir/testbuild1
+    luet build --tree "$ROOT_DIR/tests/fixtures/simple_dep" --destination $tmpdir/testbuild1 test/c
+    buildst=$?
+    assertEquals 'builds successfully' "$buildst" "0"
+    assertTrue 'create package B 1.1' "[ -e '$tmpdir/testbuild1/b-test-1.1.package.tar' ]"
+    assertTrue 'create package A 1.2' "[ -e '$tmpdir/testbuild1/a-test-1.2.package.tar' ]"
+    assertTrue 'create package C 1.0' "[ -e '$tmpdir/testbuild1/c-test-1.0.package.tar' ]"
+}
+
+testBuild() {
+    mkdir $tmpdir/testbuild2
+    luet build --tree "$ROOT_DIR/tests/fixtures/simple_dep" --destination $tmpdir/testbuild2 --only-target-package test/c
+    buildst=$?
+    assertEquals 'builds successfully' "$buildst" "0"
+    assertTrue 'create package B 1.1' "[ ! -e '$tmpdir/testbuild2/b-test-1.1.package.tar' ]"
+    assertTrue 'create package A 1.2' "[ ! -e '$tmpdir/testbuild2/a-test-1.2.package.tar' ]"
+    assertTrue 'create package C 1.0' "[ -e '$tmpdir/testbuild2/c-test-1.0.package.tar' ]"
+}
+
+# Load shUnit2.
+. "$ROOT_DIR/tests/integration/shunit2"/shunit2
+