diff --git a/reactos/lib/kernel32/tests/kernel32.xml b/reactos/lib/kernel32/tests/kernel32.xml
index aae45388495..df1d5797d82 100644
--- a/reactos/lib/kernel32/tests/kernel32.xml
+++ b/reactos/lib/kernel32/tests/kernel32.xml
@@ -12,7 +12,6 @@
kernel32_base
pseh
intrlck
- ntdll
msvcrt
-lgcc
-nostartfiles
diff --git a/reactos/lib/kernel32/tests/stubs.xml b/reactos/lib/kernel32/tests/stubs.xml
index 9afd160c929..7a98daf6b9d 100644
--- a/reactos/lib/kernel32/tests/stubs.xml
+++ b/reactos/lib/kernel32/tests/stubs.xml
@@ -125,11 +125,133 @@
RtlUnicodeStringToOemString@12
RtlUnicodeToOemN@20
RtlUnlockHeap@4
+ DbgPrint
+ LdrFindResourceDirectory_U@16
+ LdrGetDllHandle@16
+ LdrGetProcedureAddress@16
+ RtlCharToInteger@12
+ RtlUpcaseUnicodeString@12
+ RtlCreateTimerQueue@4
+ ZwAllocateVirtualMemory@24
+ ZwProtectVirtualMemory@20
+ ZwWriteVirtualMemory@20
+ RtlGetVersion@4
+ RtlVerifyVersionInfo@16
+ RtlNormalizeProcessParams@4
+ RtlDestroyEnvironment@4
+ NtCreateJobObject@12
+ NtOpenJobObject@12
+ NtIsProcessInJob@8
+ NtAssignProcessToJobObject@8
+ NtQueryInformationJobObject@20
+ NtSetInformationJobObject@16
+ NtTerminateJobObject@8
+ NtTerminateProcess@8
+ RtlRaiseStatus@4
RtlValidateHeap@12
+ RtlClearBits@12
+ RtlAreBitsSet@12
+ RtlFindClearBitsAndSet@12
+ NtQueueApcThread@20
+ NtCreateThread@32
+ CsrNewThread@0
+ CsrClientConnectToServer@20
+ CsrCaptureMessageBuffer@16
+ CsrAllocateCaptureBuffer@8
+ CsrFreeCaptureBuffer@4
+ RtlAllocateHeap@12
+ RtlDeleteTimerQueueEx@8
+ RtlDeleteTimerQueue@4
+ RtlCreateTimer@28
+ RtlDeleteTimer@12
+ RtlUpdateTimer@16
+ RtlIsTextUnicode@12
+ RtlCompareUnicodeString@12
+ RtlFindMessage@20
+ RtlDetermineDosPathNameType_U@4
+ RtlQueryProcessDebugInformation@12
+ RtlDestroyQueryDebugBuffer@4
+ RtlAllocateAndInitializeSid@44
+ RtlLengthSid@4
+ RtlCreateAcl@12
+ RtlAddAccessAllowedAce@16
+ RtlCreateSecurityDescriptor@8
+ RtlSetDaclSecurityDescriptor@16
+ RtlFreeSid@4
+ RtlFreeAnsiString@4
+ NtNotifyChangeDirectoryFile@36
+ NtCreateSymbolicLinkObject@16
+ RtlEqualUnicodeString@12
+ NtQueryEaFile@36
+ NtQueryDirectoryObject@28
+ NlsMbCodePageTag
+ NlsMbOemCodePageTag
+ RtlxUnicodeStringToOemSize@4
+ RtlMultiByteToUnicodeN@20
+ NtQueryFullAttributesFile@8
+ NtQuerySymbolicLinkObject@12
+ RtlPrefixUnicodeString@12
+ NtCreateIoCompletion@16
+ NtRemoveIoCompletion@20
+ NtSetIoCompletion@20
+ NtCancelIoFile@8
+ NtLockFile@40
+ NtUnlockFile@20
+ NtCreateMailslotFile@32
+ NtSetValueKey@24
+ NtCreateNamedPipeFile@56
+ NtSetVolumeInformationFile@20
+ RtlSizeHeap@12
+ NtQueryEvent@20
+ NtAddAtom@12
+ NtDeleteAtom@4
+ NtQueryPerformanceCounter@8
+ RtlUnwind@16
+ RtlInitializeCriticalSectionAndSpinCount@8
+ NtCreateTimer@16
+ NtOpenTimer@12
+ NtCreateMutant@16
+ NtQueryInstallUILanguage@4
+ NtClearEvent@4
+ NtOpenMutant@12
+ NtReleaseMutant@8
+ NtCreateSemaphore@20@12
+ NtOpenSemaphore@12
+ NtReleaseSemaphore@12
+ NtMapViewOfSection@40
+ RtlCreateQueryDebugBuffer@8
+ RtlInitAnsiString@8
+ RtlAnsiStringToUnicodeString@12
+ RtlFreeUnicodeString@4
+ NtCancelTimer@8
+ NtSetTimer@28
ZwMapViewOfSection@40
ZwOpenSection@12
ZwQuerySection@20
ZwQuerySystemInformation@16
ZwReadFile@36
ZwTerminateProcess@8
+ ZwClose@4
+ DbgUiIssueRemoteBreakin@4
+ NtOpenSymbolicLinkObject@12
+ RtlxUnicodeStringToAnsiSize@4
+ RtlOemToUnicodeN@20
+ RtlUnicodeToMultiByteN@20
+ NtFindAtom@12
+ NtQueryInformationAtom@20
+ RtlCreateAtomTable@8
+ RtlAddAtomToAtomTable@12
+ RtlDeleteAtomFromAtomTable@8
+ RtlLookupAtomInAtomTable@12
+ RtlQueryAtomInAtomTable@24
+ ZwOpenKey@12
+ ZwQueryValueKey@24
+ RtlQueryRegistryValues@20
+ RtlAppendUnicodeToString@8
+ @RtlUshortByteSwap@4
+ RtlAppendUnicodeStringToString@8
+ NtFlushKey@4
+ NtEnumerateValueKey@24
+ RtlUpcaseUnicodeChar@4
+ NtCreateSemaphore@20