diff --git a/parted.spec b/parted.spec
index b4d3e32..77cfeda 100644
--- a/parted.spec
+++ b/parted.spec
@@ -67,17 +67,10 @@ Parted library, you need to install this package.
 
 
 %prep
-%setup -q
+%autosetup -S git_am
 gpg2 --import %{SOURCE2} %{SOURCE3}
 gpg2 --verify %{SOURCE1} %{SOURCE0}
-git init
-git config user.email "parted-owner@fedoraproject.org"
-git config user.name "Fedora Ninjas"
-git add .
-git commit -a -q -m "%{version} baseline."
-[ -n "%{patches}" ] && git am %{patches}
 iconv -f ISO-8859-1 -t UTF8 AUTHORS > tmp; touch -r AUTHORS tmp; mv tmp AUTHORS
-git commit -a -m "run iconv"
 
 %build
 autoreconf
@@ -133,7 +126,9 @@ make check
 %changelog
 * Tue Jul 14 2020 Tom Stellard <tstellar@redhat.com> - 3.3-4
 - Use make macros
-- https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro
+  https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro
+- Switch to using %%autosetup instead of %%setup and git (bcl)
+- Update tests.yml to install git and simplify source usage (bgoncalv)
 
 * Fri Mar 06 2020 Brian C. Lane <bcl@redhat.com> - 3.3-3
 - Add chromeos_kernel partition flag for gpt disklabels