--- a/rakelib/compile.rake	Tue Aug 22 10:11:36 2017 +0100
+++ b/rakelib/compile.rake	Thu Oct 05 11:15:18 2017 +0100
@@ -104,7 +104,7 @@
   if should_remove_librun_and_stc_sources
     puts 'Cleaning up librun...'
     begin
-      rm_rf_ex STX_TOP_DIR / 'stc', exceptions: LIBRUN_BINARY_FILES
+      rm_rf_ex STX_TOP_DIR / 'librun', exceptions: LIBRUN_BINARY_FILES
     rescue
       # When something goes wrong, be safe and remove whole directory...
       rm_rf    STX_TOP_DIR / 'librun'

--- a/rakelib/test.rake	Tue Aug 22 10:11:36 2017 +0100
+++ b/rakelib/test.rake	Thu Oct 05 11:15:18 2017 +0100
@@ -69,7 +69,7 @@
     packages_args = ''
     packages.each {|p| packages_args += " -p #{p}"}
 
-    File.exist?(coveragerportformat_dot_st) ? (runner_opts = "-abortOnSEGV -I --execute #{run_report_st}") : (runner_opts = "-I -f #{run_report_st}")
+    File.exist?(coveragerportformat_dot_st) ? (runner_opts = "--abortOnSEGV --abortOnInternalError -I --execute #{run_report_st}") : (runner_opts = "-I -f #{run_report_st}")
     sh "#{exe} #{runner_opts} #{global_opts} -i \"#{BUILD_ID}\" -D \"#{report_dir}\" -r #{report} #{report_opts} #{packages_args}"
   end
   rm_rf tmp_dir

--- a/specs/stx-jv.rbspec	Tue Aug 22 10:11:36 2017 +0100
+++ b/specs/stx-jv.rbspec	Thu Oct 05 11:15:18 2017 +0100
@@ -4,8 +4,18 @@
   plat = nil
   blob = nil
   sha256 = nil
-  build = Jenkins::Build.new(%Q{https://swing.fit.cvut.cz/jenkins/job/stx_jv/lastStableBuild})
-  platform = BUILD_TARGET()
+
+  build_url = %Q{https://swing.fit.cvut.cz/jenkins/job/stx_jv/lastStableBuild}
+
+  origin_forest_url = HG::Repository.new(BUILD_DIR / '..').paths['default'].slice(0.. - 'stx-goodies-builder-rake'.size - 2) #/
+  # Temporary hack to build Smalltalk/X using stc and librun from Jan's
+  # 8.0.0 test builds
+  if (origin_forest_url =~ /192.168.27.250/) then
+    build_url = %Q{http://192.168.27.253:8080/job/stx_jv_features/job/stx-8.0.0/lastStableBuild/}
+  end
+
+  build = Jenkins::Build.new(build_url)
+  platform = BUILD_TARGET
   build.artifacts.each do | artifact |
     if (pattern =~ artifact.name) and (artifact.name.include? platform) then
       if artifact.name.end_with? '.sha256' then