diff --git a/integration/strtotime-parse-dates/TC#0068513.fmf b/integration/strtotime-parse-dates/TC#0068513.fmf
index 37a4a30..29ff7c9 100644
--- a/integration/strtotime-parse-dates/TC#0068513.fmf
+++ b/integration/strtotime-parse-dates/TC#0068513.fmf
@@ -1,13 +1,32 @@
+description: |
+    Test Name: bz444425-strtotime - Bugzilla(s) 444425
+    Author: Martin Koci (koca) <mkoci@redhat.com>
+    Location: /CoreOS/php/Regression/bz444425-strtotime
+
+    Short Description: PHP bug 37514 strtotime to parse dates with out specifying a year
+
+
+    Long Description:
+
+    When using strtotime to parse dates if an 'am' or 'pm' is added without specifying a year, dates returned are not proper
+    Short Description: PHP bug 37514 strtotime to parse dates with out specifying a year
+
+    Long Description:
+    When using strtotime to parse dates if an 'am' or 'pm' is added without specifying a year, dates returned are not proper
+contact: icesalov@redhat.com
 component:
 - php
 tag:
 - NoModularTier
 - NoRHEL3
 - NoRHEL4
+- TIPpass
 - TIPpass_Apps
 - Tier2
-relevancy: |
-    distro = rhel-3, rhel-4: False
+adjust:
+-   enabled: false
+    when: distro == rhel-3, rhel-4
+    continue: false
 extra-nitrate: TC#0068513
 extra-summary: /CoreOS/php/Regression/bz444425-strtotime
 extra-pepa: |
diff --git a/integration/strtotime-parse-dates/main.fmf b/integration/strtotime-parse-dates/main.fmf
index df70ac8..01ba086 100644
--- a/integration/strtotime-parse-dates/main.fmf
+++ b/integration/strtotime-parse-dates/main.fmf
@@ -1,23 +1,16 @@
 summary: PHP bug 37514 strtotime to parse dates with out specifying a year
-description: |
-    Test Name: bz444425-strtotime - Bugzilla(s) 444425
-    Author: Martin Koci (koca) <mkoci@redhat.com>
-    Location: /CoreOS/php/Regression/bz444425-strtotime
-
-    Short Description: PHP bug 37514 strtotime to parse dates with out specifying a year
-
-
-    Long Description:
-
-    When using strtotime to parse dates if an 'am' or 'pm' is added without specifying a year, dates returned are not proper
+contact: David Kutalek <dkutalek@redhat.com>
 component:
 - php
 test: ./runtest.sh
+path: /Regression/bz444425-strtotime
 framework: beakerlib
 recommend:
 - php
 duration: 5m
 enabled: true
 tier: '2'
+link:
+-   relates: https://bugzilla.redhat.com/show_bug.cgi?id=444425
 extra-summary: /CoreOS/php/Regression/bz444425-strtotime
 extra-task: /CoreOS/php/Regression/bz444425-strtotime
diff --git a/integration/strtotime-parse-dates/runtest.sh b/integration/strtotime-parse-dates/runtest.sh
index ebacc25..c1c711a 100755
--- a/integration/strtotime-parse-dates/runtest.sh
+++ b/integration/strtotime-parse-dates/runtest.sh
@@ -23,31 +23,35 @@ PACKAGES="${PACKAGES:-php-cli}"
 # Include Beaker environment
 . /usr/share/beakerlib/beakerlib.sh || exit 1
 
-rlStartJournal
+rlJournalStart
 
 ######################
 # Prepare environment 
 ######################
-rlPhaseStartSetup Preparation
+    rlPhaseStartSetup
         rlAssertRpm --all
         rlAssertBinaryOrigin "php"
         rlRun "php -v"
-rlPhaseEnd
+        rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory"
+        rlRun "pushd $TmpDir"
+    rlPhaseEnd
 
 ######################
 # Begin Test-Case
 ######################
-rlPhaseStartTest Test
-	rlRun "php -r 'echo date(\"r\", strtotime(\"May 18th 5:05pm\"));'|egrep '1969|1970'" 1
-	rlRun "php -r 'echo date(\"r\", strtotime(\"May 18th 5:05 pm\"));'|egrep '1969|1970'" 1
-rlPhaseEnd
+    rlPhaseStartTest
+        rlRun "php -r 'echo date(\"r\", strtotime(\"May 18th 5:05pm\"));'|egrep '1969|1970'" 1
+        rlRun "php -r 'echo date(\"r\", strtotime(\"May 18th 5:05 pm\"));'|egrep '1969|1970'" 1
+    rlPhaseEnd
 
 ######################
 # Clean after the test
 ######################
-rlPhaseStartCleanup Clean-Up
-#rlBundleLogs logs file.log another-file.log 
-rlCreateLogFromJournal > ${OUTPUTFILE}
-rlPhaseEnd
+    rlPhaseStartCleanup
+        rlRun "popd"
+        rlRun "rm -r $TmpDir" 0 "Removing tmp directory"
+    rlPhaseEnd
 
+rlJournalPrintText
+rlJournalEnd