diff --git a/data/Tupfile.lua b/data/Tupfile.lua
index 65351b13e..1b38e4e3a 100644
--- a/data/Tupfile.lua
+++ b/data/Tupfile.lua
@@ -462,7 +462,7 @@ tup.append_table(img_files, {
  {"DEMOS/PLASMA", VAR_PROGS .. "/demos/plasma/plasma"},
  {"DEMOS/SPIRAL", VAR_PROGS .. "/demos/spiral/spiral"},
  {"DEMOS/TINYFRAC", VAR_PROGS .. "/demos/tinyfrac/tinyfrac"},
- {"DEMOS/TRANTEST", VAR_PROGS .. "/demos/trantest/trunk/trantest"},
+ {"DEMOS/TRANTEST", VAR_PROGS .. "/demos/trantest/trantest"},
  {"DEMOS/TUBE", VAR_PROGS .. "/demos/tube/tube"},
  {"DEMOS/UNVWATER", VAR_PROGS .. "/demos/unvwater/unvwater"},
  {"DEMOS/WEB", VAR_PROGS .. "/demos/web/trunk/web"},
diff --git a/programs/build_all.bat b/programs/build_all.bat
index fc35fae02..19b78778f 100644
--- a/programs/build_all.bat
+++ b/programs/build_all.bat
@@ -223,7 +223,7 @@ fasm demos\plasma\trunk\plasma.asm %BIN%\demos\plasma
 fasm demos\timer\timer.asm %BIN%\demos\timer
 fasm demos\tinyfrac\tinyfrac.asm %BIN%\demos\tinyfrac
 fasm demos\transp\transp.asm %BIN%\demos\transp
-fasm demos\trantest\trunk\trantest.asm %BIN%\demos\trantest
+fasm demos\trantest\trantest.asm %BIN%\demos\trantest
 fasm demos\tube\trunk\tube.asm %BIN%\demos\tube
 fasm demos\unvwater\trunk\unvwater.asm %BIN%\demos\unvwater
 
diff --git a/programs/demos/trantest/trunk/Tupfile.lua b/programs/demos/trantest/Tupfile.lua
similarity index 79%
rename from programs/demos/trantest/trunk/Tupfile.lua
rename to programs/demos/trantest/Tupfile.lua
index 27217e426..9af9d6a91 100644
--- a/programs/demos/trantest/trunk/Tupfile.lua
+++ b/programs/demos/trantest/Tupfile.lua
@@ -1,5 +1,5 @@
 if tup.getconfig("NO_FASM") ~= "" then return end
-HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR")
+HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../.." or tup.getconfig("HELPERDIR")
 tup.include(HELPERDIR .. "/use_fasm.lua")
 add_include(tup.getvariantdir())
 
diff --git a/programs/demos/trantest/trunk/ascgl.inc b/programs/demos/trantest/ascgl.inc
similarity index 100%
rename from programs/demos/trantest/trunk/ascgl.inc
rename to programs/demos/trantest/ascgl.inc
diff --git a/programs/demos/trantest/trunk/ascl.inc b/programs/demos/trantest/ascl.inc
similarity index 100%
rename from programs/demos/trantest/trunk/ascl.inc
rename to programs/demos/trantest/ascl.inc
diff --git a/programs/demos/trantest/trunk/build_en.bat b/programs/demos/trantest/build_en.bat
similarity index 100%
rename from programs/demos/trantest/trunk/build_en.bat
rename to programs/demos/trantest/build_en.bat
diff --git a/programs/demos/trantest/trunk/build_ru.bat b/programs/demos/trantest/build_ru.bat
similarity index 100%
rename from programs/demos/trantest/trunk/build_ru.bat
rename to programs/demos/trantest/build_ru.bat
diff --git a/programs/demos/trantest/trunk/trantest.asm b/programs/demos/trantest/trantest.asm
similarity index 98%
rename from programs/demos/trantest/trunk/trantest.asm
rename to programs/demos/trantest/trantest.asm
index 56252bf7f..da8a56b92 100644
--- a/programs/demos/trantest/trunk/trantest.asm
+++ b/programs/demos/trantest/trantest.asm
@@ -1,3 +1,6 @@
+; SPDX-License-Identifier: NOASSERTION
+;
+
 ;
 ; TRIANGLE SPEED TEST 3
 ; 32 triangle draw use! 12300 triangle in sec on 800Mhz processor
@@ -19,7 +22,7 @@ use32
 SCREEN_X equ 320 ;800
 SCREEN_Y equ 200 ;600
 
-include '..\..\..\macros.inc'
+include '..\..\macros.inc'
 include 'lang.inc'
 include 'ascl.inc'
 include 'ascgl.inc'
@@ -80,7 +83,7 @@ exit:
 
 ;Draw window
 draw_window:
-    
+
     mov eax,12  ;Start
     mov ebx,1
     mcall
@@ -227,7 +230,7 @@ filled_triangle:
  mov ecx,[@@ty2]
  cmp ecx,[@@ty3]
  jge @@end_loop23
-	
+
 	mov ebx,[@@tx2]
 	shl ebx,12 ;7
 @@loop23: