diff --git a/public/gwas-test/src/main/scala/nl/lumc/sasc/biopet/pipelines/gwastest/GwasTest.scala b/public/gwas-test/src/main/scala/nl/lumc/sasc/biopet/pipelines/gwastest/GwasTest.scala
index 55099789fba1d7ee63bc03726dbb57e98faa8f72..9e8d529b7d4d9f67fb282163b3bcc5d96dfb8858 100644
--- a/public/gwas-test/src/main/scala/nl/lumc/sasc/biopet/pipelines/gwastest/GwasTest.scala
+++ b/public/gwas-test/src/main/scala/nl/lumc/sasc/biopet/pipelines/gwastest/GwasTest.scala
@@ -62,21 +62,21 @@ class GwasTest(val root: Configurable) extends QScript with BiopetQScript with R
     val snpTests = BedRecordList.fromReference(referenceFasta())
       .scatter(config("bin_size", default = 10^6))
       .allRecords.map { region =>
-      val bedFile = new File(outputDir, "snptest"  + File.separator + region.chr + File.separator +
-        s"${region.chr}-${region.start + 1}-${region.end}.bed")
-      bedFile.getParentFile.mkdirs()
+      val regionDir = new File(outputDir, "snptest"  + File.separator + region.chr)
+      regionDir.mkdirs()
+      val bedFile = new File(regionDir, s"${region.chr}-${region.start + 1}-${region.end}.bed")
       BedRecordList.fromList(List(region)).writeToFile(bedFile)
+      bedFile.deleteOnExit()
 
       val sv = new SelectVariants(this)
       sv.inputFiles :+= vcfFile
-      sv.outputFile = new File(outputDir, "snptest"  + File.separator + region.chr + File.separator +
-        s"${region.chr}-${region.start + 1}-${region.end}.vcf.gz")
+      sv.outputFile = new File(regionDir, s"${region.chr}-${region.start + 1}-${region.end}.vcf.gz")
       sv.intervals :+= bedFile
       sv.isIntermediate = true
       add(sv)
 
       //TODO: snptest
-      Map()
+      (region -> "")
     }
   }
 }