diff --git a/fs2-0.4.3-fix-metadata.diff b/fs2-0.4.3-fix-metadata.diff
deleted file mode 100644
index d50b1cd..0000000
--- a/fs2-0.4.3-fix-metadata.diff
+++ /dev/null
@@ -1,12 +0,0 @@
---- fs2-0.4.3/Cargo.toml	1970-01-01T01:00:00+01:00
-+++ fs2-0.4.3/Cargo.toml	2018-01-13T17:57:17.249853+01:00
-@@ -23,9 +23,6 @@
- version = "0.3"
- [target."cfg(unix)".dependencies.libc]
- version = "0.2.30"
--[target."cfg(windows)".dependencies.winapi]
--version = "0.3"
--features = ["handleapi", "processthreadsapi", "winerror", "fileapi", "winbase", "std"]
- [badges.appveyor]
- repository = "danburkert/fs2-rs"
- 
diff --git a/fs2-fix-metadata.diff b/fs2-fix-metadata.diff
new file mode 100644
index 0000000..bcbfcb5
--- /dev/null
+++ b/fs2-fix-metadata.diff
@@ -0,0 +1,12 @@
+--- fs2-0.4.3/Cargo.toml	1970-01-01T01:00:00+01:00
++++ fs2-0.4.3/Cargo.toml	2019-03-14T10:08:29.064745+01:00
+@@ -23,9 +23,6 @@
+ version = "0.3"
+ [target."cfg(unix)".dependencies.libc]
+ version = "0.2.30"
+-[target."cfg(windows)".dependencies.winapi]
+-version = "0.3"
+-features = ["handleapi", "processthreadsapi", "winerror", "fileapi", "winbase", "std"]
+ [badges.appveyor]
+ repository = "danburkert/fs2-rs"
+ 
diff --git a/rust-fs2.spec b/rust-fs2.spec
index 1b0dd22..ba3d650 100644
--- a/rust-fs2.spec
+++ b/rust-fs2.spec
@@ -7,16 +7,16 @@
 
 Name:           rust-%{crate}
 Version:        0.4.3
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Cross-platform file locks and file duplication
 
 # Upstream license specification: MIT/Apache-2.0
 License:        MIT or ASL 2.0
 URL:            https://crates.io/crates/fs2
-Source0:        https://crates.io/api/v1/crates/%{crate}/%{version}/download#/%{crate}-%{version}.crate
+Source:         %{crates_source}
 # Initial patched metadata
 # * No windows
-Patch0:         fs2-0.4.3-fix-metadata.diff
+Patch0:         fs2-fix-metadata.diff
 
 ExclusiveArch:  %{rust_arches}
 
@@ -58,7 +58,7 @@ which use "default" feature of "%{crate}" crate.
 %ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml
 
 %prep
-%autosetup -n %{crate}-%{version} -p1
+%autosetup -n %{crate}-%{version_no_tilde} -p1
 %cargo_prep
 
 %build
@@ -73,6 +73,9 @@ which use "default" feature of "%{crate}" crate.
 %endif
 
 %changelog
+* Thu Mar 14 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.4.3-6
+- Adapt to new packaging
+
 * Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.3-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
 
diff --git a/tests/.fmf/version b/tests/.fmf/version
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/tests/.fmf/version
@@ -0,0 +1 @@
+1
diff --git a/tests/provision.fmf b/tests/provision.fmf
new file mode 100644
index 0000000..503a97c
--- /dev/null
+++ b/tests/provision.fmf
@@ -0,0 +1,5 @@
+---
+standard-inventory-qcow2:
+  qemu:
+    # `cargo test` usually eats more than 1G.
+    m: 4G
diff --git a/tests/tests.yml b/tests/tests.yml
new file mode 100644
index 0000000..5e7414d
--- /dev/null
+++ b/tests/tests.yml
@@ -0,0 +1,13 @@
+---
+- hosts: localhost
+  roles:
+  - role: standard-test-basic
+    tags:
+    - classic
+    repositories:
+    - repo: "https://src.fedoraproject.org/tests/rust.git"
+      dest: rust
+    tests:
+    - rust/cargo-test
+    environment:
+      pkg: rust-fs2